From b801ccf0a01277b0796ee6f822346836e33de148 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 十一月 2023 14:55:46 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 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 bb12713..5de7f20 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -7,10 +7,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.NodePakoutParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
@@ -74,6 +71,8 @@
private NodeService nodeService;
@Autowired
private ManPakOutService manPakOutService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
@Transactional
@@ -104,9 +103,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq());
- detlDto.setContainerCode(elem.getContainerCode());
-
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getCsocode(), elem.getIsoseq(),elem.getContainerCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
assert one != null;
@@ -161,9 +158,7 @@
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq());
- detlDto.setContainerCode(elem.getContainerCode());
-
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getCsocode(),elem.getIsoseq(),elem.getContainerCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getCsocode(),detlDto.getIsoseq(),detlDto.getContainerCode());
assert one != null;
@@ -478,6 +473,10 @@
SaasUtils.insertLog(0,locNo,waitPakin.getMatnr(), waitPakin.getAnfme(),user.getUsername());
});
+ Node node = nodeService.selectByUuid(locNo);
+ node.setStatus(0);
+ nodeService.updateById(node);
+
//鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗�
waitPakinLogService.save(zpallet);
//鍒犻櫎鍏ュ簱閫氱煡妗�
@@ -542,6 +541,7 @@
//淇敼搴撳瓨
manLocDetl.setAnfme(manLocDetl.getAnfme()-manPakOut.getCount());
if (manLocDetl.getAnfme() == 0 ){
+ checkNodeStatus(manLocDetl.getLocNo());
manLocDetlService.delete(manLocDetlWrapper);
}else{
manLocDetl.setStatus(1);
@@ -554,8 +554,28 @@
//妫�娴嬭鍗曟槸鍚﹀畬鎴�
orderService.checkComplete(param.getOrderNo());
+ }
+ @Transactional
+ public void modifyWrkDetl(List<WrkDetl> wrkDetls, List<ModifyPakoutParam.CA> params, Long userId) {
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkDetls.get(0).getWrkNo()));
+
+ params.forEach(param ->{
+ WrkDetl wrkDetl = new WrkDetl();
+ LocDetl locDetl = locDetlService.selectByContainerCode(param.getContainerCode());
+ BeanUtils.copyProperties(locDetl,wrkDetl);
+ wrkDetl.setWrkNo(wrkDetls.get(0).getWrkNo());
+ if(wrkDetl.getAnfme() < param.getAnfme()){
+ throw new CoolException("鏂欑"+param.getContainerCode()+"鐨勭墿鏂欐暟閲忓皬浜庢嫞鏂欐暟閲忥紝璇烽噸鏂版牳瀵�");
+ }
+ wrkDetl.setAnfme(param.getAnfme());
+ wrkDetl.setModiTime(new Date());
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setModiUser(userId);
+ wrkDetlService.insert(wrkDetl);
+
+ });
}
private void saveManlocDetl(WaitPakin waitPakin, Date now, String locNo){
@@ -592,21 +612,17 @@
return status;
-
-
}
- public static void main(String[] args) {
- ManPakOut m = new ManPakOut();
- m.setAnfme(1.0);
- NodePakoutParam n = new NodePakoutParam();
- n.setAnfme(1.0);
-
- double a = 1.0;
- double b = 1.0;
- System.out.println(m.getAnfme() == n.getAnfme());
- System.out.println(a == b);
- System.out.println(Double.doubleToLongBits(m.getAnfme()) == Double.doubleToLongBits(n.getAnfme()));
+ private void checkNodeStatus(String locNo){
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
+ //濡傛灉搴撳瓨淇℃伅涓病鏈夋敼搴撲綅锛屽垯淇敼搴撲綅鐘舵�佷负1
+ if(Cools.isEmpty(manLocDetl)){
+ Node node = nodeService.selectByUuid(locNo);
+ node.setStatus(1);
+ nodeService.updateById(node);
+ }
}
+
}
--
Gitblit v1.9.1