出入库优化

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.ygtx.emcs"
         minSdk 27
         targetSdk 31
-        versionCode 29
-        versionName "1.3.9"
+        versionCode 30
+        versionName "1.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/java/com/ygtx/emcs/activity/StockInNewActivity.java

@@ -92,9 +92,9 @@ public class StockInNewActivity extends BaseActivity {
             loadErpTask(1);
         });
 //=====================test=====================
-        binding.tvScanTips.setOnClickListener(view->{
-            receiverTask("R20250430001");
-        });
+//        binding.tvScanTips.setOnClickListener(view->{
+//            receiverTask("RK_250510001");
+//        });
 //        binding.tvInCode.setOnClickListener(view->{
 //            receiverTask("11182010266");
 //        });

app/src/main/java/com/ygtx/emcs/activity/adapter/StockInListViewAdapter.java

@@ -89,14 +89,16 @@ public class StockInListViewAdapter extends BaseAdapter {
         }else if("3".equals(stockLineModel.getAutomatic())){
             mainHolder.tv_automatic.setText("其他库");
             mainHolder.tv_automatic.setTextColor(Color.RED);
-            mainHolder.tv_box_code.setText(stockLineModel.getBoxCode());
+            mainHolder.tv_box_code.setVisibility(View.GONE);
+            mainHolder.tv_box_code_tip.setVisibility(View.GONE);
         }else if("2".equals(stockLineModel.getAutomatic())){
             mainHolder.tv_automatic.setText("没库存");
             mainHolder.tv_automatic.setTextColor(Color.YELLOW);
-            mainHolder.tv_box_code.setText(stockLineModel.getBoxCode());
         }else{
             mainHolder.tv_automatic.setText("手动库");
             mainHolder.tv_automatic.setTextColor(Color.BLUE);
+            mainHolder.tv_box_code.setVisibility(View.GONE);
+            mainHolder.tv_box_code_tip.setVisibility(View.GONE);
         }
         if("1".equals(stockLineModel.getSel())){
             mainHolder.ll_item_spec.setBackgroundColor(Color.LTGRAY);

app/src/main/java/com/ygtx/emcs/util/Constant.java

@@ -43,6 +43,7 @@ public class Constant {
 
     public final static String LOG_IN = "login";
     public final static String GET_INFO = "getInfo";
+    public final static String GET_USER_MENU = "getUserMenu";
     public final static String STOCK_IN_INFO = "mes/md/instock";
     public final static String STOCK_IN_LIST = "mes/md/instock/list";
     public final static String STOCK_IN_LINE_LIST = "mes/md/line/list";
@@ -62,6 +63,7 @@ public class Constant {
     public final static String ERP_IN_STOCK_AREA_LIST =  "mes/md/inStockLineArea/list";
     public final static String SAVE_IN_STOCK_AREA = "mes/md/inStockLineArea/saveArea";
     public final static String BATCH_CODE = "mes/rms/batchCode/getBatchCode";
+    public final static String EMPTY_AREA =  "mes/md/line/getEmptyArea";
 
     public final static String ERP_OUT_STOCK = "mes/md/outstock/selectErpStockOutOrder";
     public final static String PRINTER_ITEM = "mes/md/outstockline/printer";