|
|
@@ -100,7 +100,7 @@ public class FinishedProductHandOverActivity extends Activity {
|
|
|
setContentView(R.layout.activity_finished_product_handover);
|
|
|
initView();
|
|
|
statisticsTv.setVisibility(View.VISIBLE);
|
|
|
- statisticsTv.setText("统计");
|
|
|
+ //statisticsTv.setText("统计");
|
|
|
preferences = getSharedPreferences("user", Context.MODE_PRIVATE);
|
|
|
ServerAddress_ip = preferences.getString("ServerAddress_ip", "");
|
|
|
ServerAddress_port = preferences.getString("ServerAddress_duankou", "");
|
|
|
@@ -111,16 +111,16 @@ public class FinishedProductHandOverActivity extends Activity {
|
|
|
Bundle b = getIntent().getExtras();
|
|
|
String title = b.getString("title");
|
|
|
tvTitle.setText(title);
|
|
|
- orderEdt.setFocusable(true);
|
|
|
- orderEdt.requestFocus();
|
|
|
- orderEdt.findFocus();
|
|
|
+ barcodeEdt.setFocusable(true);
|
|
|
+ barcodeEdt.requestFocus();
|
|
|
+ barcodeEdt.findFocus();
|
|
|
CommonUtil.BarcodeMaxLength(barcodeEdt, 50);
|
|
|
allListeners();
|
|
|
- thread = new HandlerThread("trademarkThread", 5);
|
|
|
- thread.start();
|
|
|
- mHandler = new Handler(thread.getLooper());
|
|
|
- OrderListRunnable orderListRunnable = new OrderListRunnable(obj);
|
|
|
- mHandler.post(orderListRunnable);
|
|
|
+ //thread = new HandlerThread("trademarkThread", 5);
|
|
|
+ //.start();
|
|
|
+ //mHandler = new Handler(thread.getLooper());
|
|
|
+ //OrderListRunnable orderListRunnable = new OrderListRunnable(obj);
|
|
|
+ //mHandler.post(orderListRunnable);
|
|
|
}
|
|
|
|
|
|
private void initView() {
|
|
|
@@ -206,17 +206,17 @@ public class FinishedProductHandOverActivity extends Activity {
|
|
|
public void onClick(View v) {
|
|
|
|
|
|
Order order = (Order) orderSpinner.getSelectedItem();
|
|
|
- int orderId;
|
|
|
- if (order == null) {
|
|
|
- CustomToast.showToast(getApplicationContext(), "订单不能为空", 2000);
|
|
|
- return;
|
|
|
- } else {
|
|
|
- orderId = order.getOrderId();
|
|
|
- if (orderId == -1) {
|
|
|
- CustomToast.showToast(getApplicationContext(), "请选择订单", 2000);
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
+ int orderId=0;
|
|
|
+ //if (order == null) {
|
|
|
+ //CustomToast.showToast(getApplicationContext(), "订单不能为空", 2000);
|
|
|
+ //return;
|
|
|
+ //} else {
|
|
|
+ //orderId = order.getOrderId();
|
|
|
+ //if (orderId == -1) {
|
|
|
+ // CustomToast.showToast(getApplicationContext(), "请选择订单", 2000);
|
|
|
+ // return;
|
|
|
+ //}
|
|
|
+ //}
|
|
|
if (barcodeInfoList == null || barcodeInfoList.size() == 0) {
|
|
|
CustomToast.showToast(getApplicationContext(), "条码信息不能为空", 2000);
|
|
|
return;
|