wuhb 1 год назад
Родитель
Сommit
1f4fccf296
1 измененных файлов с 22 добавлено и 11 удалено
  1. 22 11
      app/src/main/java/com/ygtx/emcs/activity/StockOutNewActivity.java

+ 22 - 11
app/src/main/java/com/ygtx/emcs/activity/StockOutNewActivity.java

@@ -41,6 +41,7 @@ import org.xutils.x;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 
@@ -59,6 +60,7 @@ public class StockOutNewActivity extends BaseActivity {
     private boolean isSubmit = true;
     private final Handler handler = new Handler();
     private Runnable runnable;
+    private StockLineModel selItem;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -131,7 +133,7 @@ public class StockOutNewActivity extends BaseActivity {
 //            receiverTask("CK_20250410009");
 //        });
 //        binding.tvOutCode.setOnClickListener(view->{
-//            receiverTask("BOX000028");
+//            receiverTask("11182010266");
 //        });
 //        binding.tvOutCode.setOnLongClickListener(new View.OnLongClickListener() {
 //            @Override
@@ -220,24 +222,25 @@ public class StockOutNewActivity extends BaseActivity {
                 ToastUtils.showToast(context, "发送异常");
             }
         }else if(barcode.startsWith(box_flag)){
-            StockLineModel stockLineModel = findItem(barcode);
-            if(stockLineModel == null){
+            selItem = null;
+            findItem(barcode);
+            if(selItem == null){
                 ToastUtils.showToast(context, barcode + "没有可以核对的记录");
                 return;
             }
-            checkOutLine(stockLineModel);
+            checkOutLine(selItem);
         }else{
             if(StringUtils.isEmpty(inCode)){
                 ToastUtils.showToast(context, "请扫出库单号");
                 return;
             }
+            selItem = null;
             findItemCode(barcode);
-            checkItem(barcode);
+//            checkItem(barcode);
         }
     }
 
-    private StockLineModel findItem(String barcode){
-        StockLineModel selItem = null;
+    private void findItem(String barcode){
         int i;
         for(i=0;i<stockLineList.size();i++){
             StockLineModel item = stockLineList.get(i);
@@ -256,11 +259,9 @@ public class StockOutNewActivity extends BaseActivity {
             binding.lvProduct.smoothScrollToPosition(i, 3);
             binding.lvProduct.smoothScrollToPositionFromTop(i, 0, 500);
         }
-        return selItem;
     }
 
-    private StockLineModel findItemCode(String barcode){
-        StockLineModel selItem = null;
+    private void findItemCode(String barcode){
         int i;
         for(i=0;i<stockLineList.size();i++){
             StockLineModel item = stockLineList.get(i);
@@ -276,7 +277,6 @@ public class StockOutNewActivity extends BaseActivity {
             binding.lvProduct.smoothScrollToPosition(i, 3);
             binding.lvProduct.smoothScrollToPositionFromTop(i, 0, 500);
         }
-        return selItem;
     }
 
     private void checkItem(String barcode) {
@@ -326,6 +326,7 @@ public class StockOutNewActivity extends BaseActivity {
                         stockModel = new Gson().fromJson(rs.get("data").toString(), StockModel.class);
                         if(stockModel.getRmsTaskOutstockLineList()!=null) {
                             stockLineList.addAll(stockModel.getRmsTaskOutstockLineList());
+                            setSel(stockLineList);
                         }
                         initLoadData();
                     }else if(rs.getInt("code") == 401){
@@ -574,6 +575,16 @@ public class StockOutNewActivity extends BaseActivity {
         });
     }
 
+    public void setSel(List<StockLineModel> lineModels){
+        if(selItem != null){
+            Optional<StockLineModel> optional1 = lineModels.stream().filter(item->item.getItemId().equals(selItem.getItemId())).findFirst();
+            if(optional1.isPresent()){
+                StockLineModel sel = optional1.get();
+                sel.setSel("1");
+            }
+        }
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1)
     public void onReceiveMsg(EventMessage message){
         if(message.getType() == 3){