物料整理

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

@@ -296,6 +296,48 @@ public class HomeActivity extends BaseActivity {
         });
     }
 
+    private void getConfig(String key){
+        RequestParams params = httParams(Constant.GET_INFO);
+        x.http().get(params, new Callback.CommonCallback<JSONObject>() {
+            @Override
+            public void onSuccess(JSONObject rs) {
+                mylog.info(rs);
+//                try {
+//                    if (rs.getInt ("code")== 200) {
+//                        Constant.user = new Gson().fromJson(rs.getString("user"), UserModel.class);
+//                        Constant.user.setLoginName(loginName);
+//                        Constant.user.setLoginPwd(loginPwd);
+//                        Object userName = Constant.user.getUserName();
+//                        if (userName != null) {
+//                            showUser();
+//                        }
+//                    }else if(rs.getInt("code") == 401){
+//                        ToastUtils.showToast(context, "会话过期");
+//                        logoutAuth(rs.getInt("code"));
+//                    }else{
+//                        ToastUtils.showToast(context, rs.getString("msg"));
+//                    }
+//                } catch (JSONException e) {
+//                    e.printStackTrace();
+//                }
+            }
+            @Override
+            public void onError(Throwable ex, boolean isOnCallback) {
+                ex.printStackTrace();
+                HttpsUtil.parserError(HomeActivity.this, ex);
+                mylog.error("请求异常：", ex);
+            }
+            @Override
+            public void onFinished() {
+
+            }
+            @Override
+            public void onCancelled(CancelledException arg0) {
+                mylog.error("onRead:", arg0);
+            }
+        });
+    }
+
     @Override
     protected String getCommonTopTitle() {
         return Res.getString("app_name");

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

@@ -60,8 +60,8 @@ public class StockChangeActivity extends BaseActivity {
     private String boxCode;
     private Button submit;
     private String from;
-//    private String srcArea;
-    private BoxCodeModel srcBox;
+    private String srcArea;
+//    private BoxCodeModel srcBox;
     private BoxCodeModel tarBox;
 
     @Override
@@ -153,7 +153,7 @@ public class StockChangeActivity extends BaseActivity {
             @Override
             public void afterTextChanged(Editable s) {
                 String val = s.toString();
-                if(val.startsWith(box_flag) && !XBK.equals(srcBox.getAreaCode())){
+                if(val.startsWith(box_flag)){
                     binding.llTargetArea.setVisibility(View.VISIBLE);
                     if(val.length() > 8){
                         loadBox(val, false);
@@ -212,7 +212,7 @@ public class StockChangeActivity extends BaseActivity {
             loadErpTask(barcode);
         }else if(StringUtils.isEmpty(tarCode)){
             binding.tvTargetCode.setText(barcode);
-            if(barcode.startsWith(box_flag) && !XBK.equals(srcBox.getAreaCode())){
+            if(barcode.startsWith(box_flag)){
                 binding.llTargetArea.setVisibility(View.VISIBLE);
                 loadBox(barcode, true);
             }else{
@@ -254,10 +254,6 @@ public class StockChangeActivity extends BaseActivity {
                     }else{
                         ToastUtils.showToast(context, rs.getString("msg"));
                     }
-                    if(materialStockModels.size() == 1){
-                        String boxCode = materialStockModels.get(0).getAttr1();
-                        loadSrcBox(boxCode, 0);
-                    }
                     if(materialStockModels.size() == 0){
                         binding.lvProduct.setVisibility(View.GONE);
                         binding.tvEmpty.setVisibility(View.VISIBLE);
@@ -357,8 +353,8 @@ public class StockChangeActivity extends BaseActivity {
                 mylog.info(rs.toString());
                 try {
                     if (rs.getInt("code") == 200) {
-                        srcBox = new Gson().fromJson(rs.get("data").toString(), BoxCodeModel.class);
-//                        srcArea = srcBox.getAreaCode();
+                        BoxCodeModel srcBox = new Gson().fromJson(rs.get("data").toString(), BoxCodeModel.class);
+                        srcArea = srcBox.getAreaCode();
                         if(type == 1){
                             sendChange();
                         }
@@ -400,31 +396,16 @@ public class StockChangeActivity extends BaseActivity {
             ToastUtils.showToast(context, "目标位置不能为空");
             return;
         }
-//        if(!XBK.equals(srcBox.getAreaCode())) {
-//            if (tarCode.startsWith(box_flag) && StringUtils.isEmpty(tarArea)) {
-//                loadBox(tarCode, true);
-//                ToastUtils.showToast(context, "目标库位不能为空");
-//                return;
-//            }
-//        }
         Optional<MaterialStockModel> optional = materialStockModels.stream().filter(item->"1".equals(item.getSel())).findFirst();
         optional.ifPresent(stockModel -> materialStockModel = stockModel);
-//        if(materialStockModel == null){
-//            ToastUtils.showToast(context, "选择需要转移的物料");
-//            return;
-//        }
-//        if(materialStockModel.getMaterialStockId()==null){
-//            ToastUtils.showToast(context, "无效的库存ID");
-//            return;
-//        }
         submit.setEnabled(false);
         MyProgress myProgress = MyProgress.getInstance();
         myProgress.show(context, "提示", "正在提交数据");
         RequestParams params = httParams(Constant.CHANGE_BOX_AREA);
         if(srcCode.startsWith(box_flag)){
             params.addBodyParameter("boxCodeOld", srcCode);
-            if(srcBox!=null){
-                params.addBodyParameter("areaCodeOld", srcBox.getAreaCode());
+            if(!StringUtils.isEmpty(srcArea)){
+                params.addBodyParameter("areaCodeOld", srcArea);
             }
         }else{
             params.addBodyParameter("areaCodeOld", srcCode);

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

@@ -131,9 +131,9 @@ public class StockOutNewActivity extends BaseActivity {
         }
         reloadData();
 // ========================test========================
-//        binding.tvScanTips.setOnClickListener(view->{
-//            receiverTask("XSCK202504280001");
-//        });
+        binding.tvScanTips.setOnClickListener(view->{
+            receiverTask("CK_20250429001");
+        });
 //        binding.tvOutCode.setOnClickListener(view->{
 //            receiverTask("BOX000008");
 //        });