From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步，增加水分，挥发段，分解段搜索，按照最大最小范围，包装类型跟托盘类型增加删选功能。 2.已经出库的物料，在明细表里面隐藏掉，但是数据保留。 3.增加二个跟聚乳酸一样的明细表，分改性树脂，纯树脂库存明细表，所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下，相对压缩一下，搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理，举例原有系统里面销售选定的10包物料，再二次重新弄后，车间打印新标签，使用新的包号，在明细表里面体现原有所有指标信息及批号，包号，牌号跟新的关联 7.出库时候时间可选历史，不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择
---
src/main/java/com/zy/asrs/controller/MobileController.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ac86564..8a36e05 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -429,6 +429,7 @@
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
+ String brand = jsonObject.get("brand").toString();
String batch = jsonObject.get("batch").toString();
Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
@@ -438,7 +439,7 @@
if(true){
User user = new User();
user.setUsername("test");
- mobileService.plaPakin(locNo,batch,packageNo,user);
+ mobileService.plaPakin(brand,locNo,batch,packageNo,user);
}
}
return R.ok("鍏ュ簱鎴愬姛");
@@ -448,18 +449,20 @@
// @ManagerAuth(memo="pla鍑哄簱")
public R plaPackOut1(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
+ String brand = json.get("brand").toString();
String batch = json.get("batch").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();
Double anfme = Double.parseDouble(json.get("anfme").toString());
+ boolean isReplace = Cools.eq(json.get("replace").toString(),"y");
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme,isReplace);
return R.ok();
}
@@ -467,35 +470,53 @@
// @ManagerAuth(memo="pla鍑哄簱")
public R plaPackOut(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
+ String brand = json.get("brand").toString();
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
- String orderDetlId = json.get("orderDetlId").toString();
+ String plaQtyId = json.get("orderDetlId").toString();
String wrkNo = json.get("wrkNo").toString();
Double anfme = Double.parseDouble(json.get("anfme").toString());
+ boolean isReplace = !Cools.isEmpty(json.get("replace")) && Cools.eq(json.get("replace").toString(),"y");
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,plaQtyId,wrkNo,anfme,isReplace);
+ return R.ok();
+ }
+
+ /*
+ 鏃犺鍗曟嫞璐у嚭搴�
+ */
+ @RequestMapping("/plaDetl/packout/noOrder/v1")
+ //@ManagerAuth(memo="pla鎵嬪姩鍑哄簱")
+ public R plaPackOutWithoutOrder(@RequestBody List<PlaParam> params){
+
+ for (PlaParam param : params){
+ mobileService.plaPackOutWithoutOrder(param.getBrand(),param.getBatch(),param.getPackageNo(),param.getAnfme());
+ }
+
return R.ok();
}
@RequestMapping("/plaDetl/check/v1")
public R plaDetlCheck(@RequestBody JSONObject json){
+ String brand = json.get("brand").toString();
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("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
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) || Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_00)) && type != 2){
return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
}
return R.ok(pla);
@@ -505,8 +526,9 @@
pla绉诲簱
*/
@RequestMapping("/plaDetl/move/v1")
+ @ManagerAuth
public R plaDetlMove(@RequestBody JSONObject json){
-
+ String brand = json.get("brand").toString();
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String locNo = json.get("locNo").toString();
@@ -515,9 +537,12 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
+ }
+ if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)){
+ return R.error("璇ュ寘鐗╂枡鐘舵�佷笉涓哄凡鍏ュ簱鐘舵�侊紝鏃犳硶杞Щ");
}
Node node = nodeService.selectByUuid(locNo);
@@ -561,6 +586,12 @@
return R.ok();
}
+ @RequestMapping("select/mat/information/v1")
+ @ManagerAuth
+ public R pdaSelectInformation(@RequestParam String barcode){
+ List<Pla> locDetls = mobileService.pdaSelectInfmt(barcode);
+ return R.ok(locDetls);
+ }
public static void main(String[] args) {
--
Gitblit v1.9.1