From aa310a47a05110a393c508921c92fa17ea95b491 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 三月 2024 13:08:12 +0800
Subject: [PATCH] 导入修改
---
src/main/java/com/zy/asrs/controller/MobileController.java | 86 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 79 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 083be11..c26c5be 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.SaasUtils;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import com.zy.system.entity.User;
@@ -55,6 +56,8 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private PlaService plaService;
+ @Autowired
+ private NodeService nodeService;
// 鍟嗗搧涓婃灦
@@ -427,7 +430,7 @@
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
String batch = jsonObject.get("batch").toString();
- String packageNo = jsonObject.get("packageNo").toString();
+ Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
@@ -446,7 +449,7 @@
public R plaPackOut1(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
String batch = json.get("batch").toString();
- String packageNo = json.get("packageNo").toString();
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
String orderDetlId = json.get("orderDetlId").toString();
String wrkNo = json.get("wrkNo").toString();
@@ -465,7 +468,7 @@
public R plaPackOut(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
String batch = json.get("batch").toString();
- String packageNo = json.get("packageNo").toString();
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
String orderDetlId = json.get("orderDetlId").toString();
String wrkNo = json.get("wrkNo").toString();
@@ -483,7 +486,32 @@
@RequestMapping("/plaDetl/check/v1")
public R plaDetlCheck(@RequestBody JSONObject json){
String batch = json.get("batch").toString();
- String packageNo = json.get("packageNo").toString();
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
+ Integer type = Integer.parseInt(json.get("type").toString());
+ if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ if ((Cools.isEmpty(pla))){
+ return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
+ }
+ if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) && type != 2){
+ return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
+ }
+ return R.ok(pla);
+ }
+
+ /*
+ pla绉诲簱
+ */
+ @RequestMapping("/plaDetl/move/v1")
+ @ManagerAuth
+ public R plaDetlMove(@RequestBody JSONObject json){
+
+ String batch = json.get("batch").toString();
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
+ String locNo = json.get("locNo").toString();
if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
@@ -493,11 +521,52 @@
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
- if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0)){
- return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
+ if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)){
+ return R.error("璇ュ寘鐗╂枡鐘舵�佷笉涓哄凡鍏ュ簱鐘舵�侊紝鏃犳硶杞Щ");
}
- return R.ok(pla);
+
+ Node node = nodeService.selectByUuid(locNo);
+ if(Cools.isEmpty(node)){
+ throw new CoolException("搴撲綅淇℃伅涓嶆纭�");
+ }
+
+ String sourceLocNo = pla.getLocNo();
+
+ pla.setLocNo(locNo);
+ pla.setStash(node.getParentName());
+ pla.setModifyTime(new Date());
+
+ plaService.updateById(pla);
+
+ SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
+ locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+
+ return R.ok();
}
+
+ /*
+ 鏍规嵁鎷ｈ揣鍗曞嚭搴� ------> 鑾峰彇鎷ｈ揣鍗�
+ */
+ @RequestMapping("/manpakout/check/v1")
+ public R getManPakout (@RequestBody JSONObject json){
+
+ String orderNo = json.get("orderNo").toString();
+
+ return R.ok(mobileService.getManPakoutByOrderNo(orderNo));
+ }
+
+ @RequestMapping("/manpakout/pakout/v1")
+ public R pakout(@RequestBody JSONObject json){
+
+ String batch = json.get("batch").toString();
+ Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
+ String orderNo = json.get("orderNo").toString();
+
+
+
+ return R.ok();
+ }
+
public static void main(String[] args) {
// String aa = "[{\"batch\":\"2023090304\",\"packageNo\":\"8\"},{\"batch\":\"2023090304\",\"packageNo\":\"8\"}]";
@@ -509,6 +578,9 @@
String s = "2024010502";
System.out.println(s.substring(8,10));
+
+ Object s1 = "8";
+ System.out.println(Integer.parseInt(s1.toString()));
}
}
--
Gitblit v1.9.1