From 3485effe3f65dbfdeaf4c3c1efca3d9fa6cd4d94 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 01 三月 2024 13:46:18 +0800
Subject: [PATCH] 修改库存明细按车间分组统计
---
src/main/java/com/zy/asrs/controller/MobileController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index dea887e..c26c5be 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -430,7 +430,7 @@
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
String batch = jsonObject.get("batch").toString();
- Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
+ Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
@@ -487,6 +487,7 @@
public R plaDetlCheck(@RequestBody JSONObject json){
String batch = json.get("batch").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("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
@@ -495,7 +496,7 @@
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
- if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0)){
+ if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) && type != 2){
return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
}
return R.ok(pla);
@@ -505,6 +506,7 @@
pla绉诲簱
*/
@RequestMapping("/plaDetl/move/v1")
+ @ManagerAuth
public R plaDetlMove(@RequestBody JSONObject json){
String batch = json.get("batch").toString();
@@ -518,6 +520,9 @@
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
+ }
+ if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)){
+ return R.error("璇ュ寘鐗╂枡鐘舵�佷笉涓哄凡鍏ュ簱鐘舵�侊紝鏃犳硶杞Щ");
}
Node node = nodeService.selectByUuid(locNo);
@@ -533,7 +538,8 @@
plaService.updateById(pla);
- SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),locNo,pla.getBatch(),pla.getPackageNo());
+ SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
+ locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
return R.ok();
}
@@ -572,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