From 6fd6fd0b4e90a816989632506934bdfdb431f47f Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:38:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 deletions(-)
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 541d386..012f0a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -92,11 +92,18 @@
throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄥ簱");
}
+ //鍒ゆ柇鎵樼洏鏄惁宸茬粡鍦ㄥ伐浣滄。
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄤ换鍔℃。涓�");
+ }
+
//鍒ゆ柇鏄惁瀛樺湪鏂欑鐮� => 瀛樺湪鏂欑鐮佸垯瑕佹眰鎻愪氦涓婃潵鐨勭墿鏂檒ist蹇呴』鍏ㄩ儴閮芥湁鏂欑鐮�
boolean hasContainerCode = false;
int containerCodeCount = 0;//鏂欑鐮佹暟閲�
for (CombParam.CombMat combMat : param.getCombMats()) {
- if (combMat.getContainerCode() != null) {
+ if(!Cools.isEmpty(combMat.getContainerCode())){
+ //if (combMat.getContainerCode() != null) {
hasContainerCode = true;
containerCodeCount++;
continue;
@@ -142,7 +149,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq(),elem.getContainerCode());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq(),elem.getContainerCode(),elem.getProddate(),elem.getDeadline());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
assert one != null;
@@ -169,7 +176,8 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
-
+ waitPakin.setProddate(detlDto.getProddate());
+ waitPakin.setDeadline(detlDto.getDeadline());
waitPakin.setThreeCode(detlDto.getCsocode());
waitPakin.setDeadTime(detlDto.getIsoseq());
waitPakin.setSuppCode(detlDto.getContainerCode());
@@ -197,7 +205,7 @@
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq(),elem.getContainerCode());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq(),elem.getContainerCode(),elem.getProddate(),elem.getDeadline());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
assert one != null;
@@ -223,7 +231,8 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
-
+ waitPakin.setProddate(detlDto.getProddate());
+ waitPakin.setDeadline(detlDto.getDeadline());
waitPakin.setThreeCode(detlDto.getCsocode());
waitPakin.setDeadTime(detlDto.getIsoseq());
waitPakin.setSuppCode(detlDto.getContainerCode());
@@ -615,6 +624,48 @@
});
}
+ @Override
+ public void nodePakinNoComb(CombParam param) {
+ if(Cools.isEmpty(param.getLocno())){
+ throw new CoolException("搴撲綅鍙锋湭濉啓锛屾棤娉曞叆搴�");
+ }
+ param.getCombMats().forEach(combMat -> {
+ Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", param.getLocno()).eq("matnr",combMat.getMatnr());
+ Utils.wapperSetCondition(wrapper,"container_code",combMat.getContainerCode());
+ Utils.wapperSetCondition(wrapper,"batch",combMat.getBatch());
+ Utils.wapperSetCondition(wrapper,"csocode",combMat.getCsocode());
+ Utils.wapperSetCondition(wrapper,"isoseq",combMat.getIsoseq());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
+ if(Cools.isEmpty(manLocDetl)){
+ saveManlocDetl(combMat,param.getLocno());
+ }else{
+ manLocDetl.setAnfme(manLocDetl.getAnfme() + combMat.getAnfme());
+ manLocDetlService.update(manLocDetl,wrapper);
+ }
+ //鐢熸垚骞冲簱鍏ュ嚭搴撴棩蹇�
+ SaasUtils.insertLog(0,param.getLocno(),combMat.getMatnr(), combMat.getAnfme(),"");
+ });
+
+ }
+
+ private boolean saveManlocDetl(CombParam.CombMat combMat, String locNo){
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("name", locNo));
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ ManLocDetl manLocDetl = new ManLocDetl();
+ BeanUtils.copyProperties(mat,manLocDetl);
+ manLocDetl.setAnfme(combMat.getAnfme());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setContainerCode(combMat.getContainerCode());
+ manLocDetl.setCsocode(combMat.getCsocode());
+ manLocDetl.setIsoseq(combMat.getIsoseq());
+ manLocDetl.setCreateTime(new Date());
+ manLocDetl.setModiTime(new Date());
+ manLocDetl.setLocNo(locNo);
+ manLocDetl.setStatus(1);
+ return manLocDetlService.insert(manLocDetl);
+ }
+
private void saveManlocDetl(WaitPakin waitPakin, Date now, String locNo){
Node node = nodeService.selectOne(new EntityWrapper<Node>()
--
Gitblit v1.9.1