From 71d838e032d13a46a07917f5606862496220ea74 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 一月 2024 08:35:35 +0800
Subject: [PATCH] # 入库拣货功能添加
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 9bf7fa4..56ac370 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -21,6 +21,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
+import com.zy.system.service.SaasLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -100,6 +101,10 @@
private LocOwnerService locOwnerService;
@Autowired
private PlaService plaService;
+ @Autowired
+ private PlaQtyService plaQtyService;
+ @Autowired
+ private SaasLogService saasLogService;
@@ -1204,25 +1209,33 @@
@Override
public void plaPakin(String locNo, String batch, String packageNo) {
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ if(!pla.getLocNo().equals(locNo)){
+ throw new CoolException("璇ョ墿鏂欏叆搴撶殑搴撲綅閿欒");
+ }
if("宸插叆搴�".equals(pla.getStatus())){
throw new CoolException("璇ョ墿鏂欏凡鍏ュ簱");
}
pla.setStatus("宸插叆搴�");
pla.setModifyTime(new Date());
plaService.updateById(pla);
+ SaasUtils.insertLog(0,locNo,batch+","+packageNo,pla.getWeightAnfme(),null);
}
@Override
@Transactional
public void plaPakout(String locNo, String batch, String packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
- //Order order = orderService.selectByNo(orderNo);
- OrderDetl orderDetl = orderDetlService.selectById(orderDetlId);
+
ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
+
+ PlaQty plaQty = plaQtyService.selectById(orderDetlId);
//鏇存柊鎷ｈ揣鍗曚俊鎭�
if(manPakOut.getCount() + anfme > manPakOut.getAnfme()){
throw new CoolException("鎷ｈ揣閲嶉噺澶т簬鎷ｈ揣鍗曟墍闇�鎷ｈ揣閲嶉噺锛岃閲嶆柊鍒嗛厤鎷ｈ揣閲嶉噺");
+ }
+ if(manPakOut.getStatus() == 1){
+ throw new CoolException("璇ユ嫞鏂欏崟宸插嚭搴�");
}
manPakOut.setCount(manPakOut.getCount() + anfme);
if (manPakOut.getAnfme().equals(manPakOut.getCount())){
@@ -1230,21 +1243,16 @@
manPakOutService.updateById(manPakOut);
}
- //鏇存柊鍗曟嵁鏄庣粏
- orderDetl.setQty(orderDetl.getQty() + anfme);
- orderDetlService.updateById(orderDetl);
-
- //鏇存柊鍗曟嵁淇℃伅
- orderService.checkComplete(orderNo);
-
//鏇存柊pla鏄庣粏
pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
+ pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
if(pla.getWeightAnfme() <= 0){
pla.setStatus("鍏ㄩ儴鍑哄簱");
}else {
pla.setStatus("閮ㄥ垎鍑哄簱");
}
plaService.updateById(pla);
+ SaasUtils.insertLog(1,locNo,batch+","+packageNo,anfme,null);
}
}
--
Gitblit v1.9.1