Ver código fonte

过滤自动单

wuhb 1 ano atrás
pai
commit
1ab6e1de14

+ 3 - 1
app/src/main/java/com/ygtx/emcs/activity/StockInNewActivity.java

@@ -141,7 +141,9 @@ public class StockInNewActivity extends BaseActivity {
         if("1".equals(from)) {
            return;
         }
-        if(barcode.startsWith(in_stock_flag)) {
+        String inCode = binding.tvInCode.getText().toString();
+        if(StringUtils.isEmpty(inCode)
+                || barcode.startsWith(in_stock_flag)) {
             try {
                 binding.tvInCode.setText(barcode);
                 loadErpTask(barcode);

+ 3 - 3
app/src/main/java/com/ygtx/emcs/activity/StockItemActivity.java

@@ -67,9 +67,9 @@ public class StockItemActivity extends BaseActivity {
         }
         stockItemViewAdapter = new StockItemViewAdapter(materialStockModels, context);
         binding.lvProduct.setAdapter(stockItemViewAdapter);
-//        binding.tvScanTips.setOnClickListener(view->{
-//            receiverTask("A0001");
-//        });
+        binding.tvScanTips.setOnClickListener(view->{
+            receiverTask("B0001");
+        });
 //        binding.tvInCode.setOnClickListener(view->{
 //            receiverTask("1118200544");
 //        });

+ 3 - 1
app/src/main/java/com/ygtx/emcs/activity/StockOutNewActivity.java

@@ -152,7 +152,9 @@ public class StockOutNewActivity extends BaseActivity {
         if("1".equals(from)) {
             return;
         }
-        if(barcode.startsWith(out_stock_flag)){
+        String inCode = binding.tvOutCode.getText().toString();
+        if(StringUtils.isEmpty(inCode)
+                || barcode.startsWith(out_stock_flag)){
             try {
                 binding.tvOutCode.setText(barcode);
                 loadErpTask(barcode);

+ 3 - 1
app/src/main/java/com/ygtx/emcs/activity/StockPackageActivity.java

@@ -153,7 +153,9 @@ public class StockPackageActivity extends BaseActivity {
     @Override
     public void receiverTask(String barcode) {
         System.out.println("扫码:" + barcode);
-        if(barcode.startsWith(out_stock_flag)){
+        String inCode = binding.tvOutCode.getText().toString();
+        if(StringUtils.isEmpty(inCode)
+                || barcode.startsWith(out_stock_flag)){
             try {
                 binding.tvOutCode.setText(barcode);
                 loadErpTask(barcode);