From 3db6c2d4a320891666b55780595b6793667342fd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 08 三月 2024 14:48:54 +0800
Subject: [PATCH] 添加牌号作为唯一物料的筛选条件
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 6 +++---
src/main/java/com/zy/asrs/service/PlaService.java | 2 +-
src/main/java/com/zy/asrs/controller/PlaController.java | 2 +-
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 2 +-
src/main/webapp/static/js/pla/plaDetl.js | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/controller/MobileController.java | 16 ++++++++++------
src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/MobileService.java | 4 ++--
9 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ec4aa72..01339ec 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 = json.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,6 +449,7 @@
// @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();
@@ -459,7 +461,7 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
return R.ok();
}
@@ -467,6 +469,7 @@
// @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();
@@ -478,13 +481,14 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
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());
@@ -492,7 +496,7 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
@@ -508,7 +512,7 @@
@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();
@@ -517,7 +521,7 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index ba081bb..881e4d3 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -103,7 +103,7 @@
public R delete(@RequestBody List<Pla> plas) {
System.out.println(plas.toString());
plas.forEach(pla -> {
- if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_1)){
throw new CoolException("宸插叆搴撶殑鏁版嵁鏃犳硶琚垹闄�");
}
Pla plaSave = plaService.selectById(pla.getId());
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 3b7926b..648f6b1 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -56,9 +56,9 @@
R manDetlOriginOut(JSONObject json, User user);
- void plaPakin(String locNo, String batch, Integer packageNo, User user);
+ void plaPakin(String brand,String locNo, String batch, Integer packageNo, User user);
- void plaPakout(String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo,Double anfme);
+ void plaPakout(String brand,String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo,Double anfme);
/*
鑾峰彇鎷ｈ揣鍗曚俊鎭�
diff --git a/src/main/java/com/zy/asrs/service/PlaService.java b/src/main/java/com/zy/asrs/service/PlaService.java
index c62526a..ea13b76 100644
--- a/src/main/java/com/zy/asrs/service/PlaService.java
+++ b/src/main/java/com/zy/asrs/service/PlaService.java
@@ -11,7 +11,7 @@
public interface PlaService extends IService<Pla> {
- Pla selectByBatchAndPackageNo(String batch, Integer packageNo);
+ Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand);
void queryStock(OrderDetl orderDetl, List<PlaQty> plaQties);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2297a18..a86628f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1207,8 +1207,8 @@
}
@Override
- public void plaPakin(String locNo, String batch, Integer packageNo,User user) {
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ public void plaPakin(String brand, String locNo, String batch, Integer packageNo, User user) {
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if(Cools.isEmpty(pla)){
throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
}
@@ -1236,8 +1236,8 @@
@Override
@Transactional
- public void plaPakout(String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ public void plaPakout(String brand, String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java
index 2f46d25..09b1651 100644
--- a/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PakoutServiceImpl.java
@@ -58,7 +58,7 @@
List<Pakout> pakouts = selectList(new EntityWrapper<Pakout>().eq("doc_num", docNum));
for (Pakout pakout: pakouts){
- Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), Integer.parseInt(pakout.getBarcode()));
+ Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), Integer.parseInt(pakout.getBarcode()), pakout.getMaktx());
if(!Cools.isEmpty(pla)){
pla.setQtyAnfme(pla.getQtyAnfme() - pakout.getAnfme());
pla.setModifyTime(new Date());
@@ -116,7 +116,7 @@
}
//鏇存柊pla淇℃伅
- Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), Integer.parseInt(pakout.getBarcode()));
+ Pla pla = plaService.selectByBatchAndPackageNo(pakout.getBatch(), Integer.parseInt(pakout.getBarcode()),pakout.getMaktx());
pla.setQtyAnfme(pla.getQtyAnfme() - pakout.getAnfme());
pla.setStatus(GlobleParameter.PLA_STATUS_1);
pla.setModifyTime(new Date());
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index f90e61a..c87188c 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -28,8 +28,8 @@
@Autowired
private PlaQtyService plaQtyService;
- public Pla selectByBatchAndPackageNo(String batch, Integer packageNo) {
- return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo));
+ public Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand) {
+ return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand));
}
@Override
@@ -117,7 +117,7 @@
plaQtyService.insert(plaQtyReturned);
//鐩存帴鏇存柊pla鐨勫簱瀛�
- Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
+ Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo(),plaQty.getBrand());
//pla.setStatus(GlobleParameter.PLA_STATUS_0);
pla.setModifyTime(new Date());
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index fff1643..245b032 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -73,7 +73,7 @@
if(Cools.isEmpty(excel.getBatch()) || Cools.isEmpty(excel.getPackageNo())){
throw new CoolException("绗�" + index++ + "鏁版嵁閿欒锛屽寘鍙锋垨鑰呮壒鍙蜂负绌�");
}
- Pla pla = plaService.selectByBatchAndPackageNo(excel.getBatch(),excel.getPackageNo());
+ Pla pla = plaService.selectByBatchAndPackageNo(excel.getBatch(),excel.getPackageNo(),excel.getBrand());
if (pla == null) {
pla = plaCreate(pla,excel,matService,nodeService);
pla.setCreateTime(new Date());
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 2167eca..d5e603d 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -466,9 +466,9 @@
layer.closeAll();
for (let i=0;i<printData.data.length;i++){
if (className === 'template-barcode') {
- printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+(printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
+ printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1¶m="+(printData.data[i].brand+";"+printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
} else {
- printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+(printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
+ printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+(printData.data[i].brand+";"+printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
}
}
var tpl = templateDom.html();
--
Gitblit v1.9.1