wuhb 1 год назад
Родитель
Сommit
1b73310413

+ 2 - 4
app/src/main/java/com/ygtx/emcs/activity/StockInBindActivity.java

@@ -105,7 +105,7 @@ public class StockInBindActivity extends BaseActivity {
             binding.btAdd.setVisibility(View.GONE);
             binding.etBatch.setEnabled(false);
             binding.etBatch.setTextColor(Color.BLUE);
-        }else{
+        }else if(StringUtils.isEmpty(lineModel.getBatchCode())){
             getBatchCode(lineModel.getItemCode(), binding.etBatch);
         }
         box_flag = CacheService.getInstance(context).getCache(CACHE_BIND_CONFIG, "box_flag");
@@ -557,9 +557,7 @@ public class StockInBindActivity extends BaseActivity {
             if(boxCode.equals(barcode)){
                 return;
             }
-            if(StringUtils.isEmpty(boxCode)){
-                boxCodeET.setText(barcode);
-            }
+            boxCodeET.setText(barcode);
         }
     }
 

+ 1 - 0
app/src/main/java/com/ygtx/emcs/activity/StockOutBindActivity.java

@@ -910,6 +910,7 @@ public class StockOutBindActivity extends BaseActivity {
         }
         View popup_list_view= LayoutInflater.from(context).inflate(R.layout.popupwindow_list_view,null);
         ListView mListView = popup_list_view.findViewById(R.id.lv_data);
+        mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
         Button itemCancel = popup_list_view.findViewById(R.id.bt_item_cancel);
         itemCancel.setOnClickListener(v -> {
             if(popupWindow1!=null){