From 2ee70a38e4c832e3888b12d29ebf962456069cdb Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 03 七月 2024 14:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 1
src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java | 2 +
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 1
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 +++++++++++
src/main/resources/mapper/WaitPakinLogMapper.xml | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 28 ++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 7 +++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 +
src/main/java/com/zy/asrs/service/MobileService.java | 2 +
9 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 630bdd7..15eebc8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -581,4 +581,11 @@
return R.ok();
}
+ @RequestMapping("/adjustNew/v2/auth")
+ @ManagerAuth(memo = "琛ヨ揣")
+ public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("琛ヨ揣鎴愬姛");
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java
index 87f9c6f..6042cac 100644
--- a/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MobileAdjustParam.java
@@ -15,6 +15,8 @@
private Integer wrkNo;
+ private String barcode;
+
private List<WrkDetl> wrkDetls;
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 6b219d3..06ab3c4 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -54,4 +54,6 @@
R manDetlIn(JSONObject json);
R manDetlOut(JSONObject json);
+
+ void adjustNew(MobileAdjustParam param, Boolean re, Long userId);
}
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 18fdaa5..8b61e77 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -978,5 +978,33 @@
return R.ok("涓嬫灦瀹屾垚");
}
+ @Override
+ @Transactional
+ public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
+ Date now = new Date();
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ if (Cools.isEmpty(wrkMast)){
+ throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鏃犳湁鏁堝伐浣滄。");
+ }else if (wrkMast.getIoType()!=103){
+ throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。闈炴嫞鏂欎换鍔�");
+ }else if (wrkMast.getWrkSts()!=14.0){
+ throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。宸ヤ綔鐘舵�佷笉鏄嚭搴撳畬鎴�");
+ }
+// List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+
+ List<WrkDetl> wrkDetls = param.getWrkDetls();
+ for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setZpallet(param.getBarcode());
+ wrkDetl.setMatnr("B"+wrkDetl.getMatnr());
+ wrkDetl.setAnfme(-wrkDetl.getAnfme());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetlService.insert(wrkDetl);
+ }
+
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index e54969f..29ec048 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -271,6 +271,9 @@
}
}
for (DetlDto detlDto : list) {
+ if (detlDto.getMatnr().substring(0,1).equals("B")) {
+ detlDto.setMatnr(detlDto.getMatnr().substring(1));
+ };
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
OrderDetl orderDetl = new OrderDetl();
if (Cools.isEmpty(mat)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 0f50023..ddde299 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -119,6 +119,7 @@
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
for (DetlDto detlDto : detlDtos) {
+ if (detlDto.getMatnr().substring(0,1).equals("B")) continue;
// 淇敼璁㈠崟鏄庣粏鏁伴噺
if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 7d518be..f821f84 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
@@ -23,6 +24,9 @@
@Transactional
public class WorkMastHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private MatService matService;
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -161,6 +165,10 @@
return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
for (WrkDetl wrkDetl : wrkDetls53) {
+ String matnr = wrkDetl.getMatnr();
+ if (matnr.substring(0,1).equals("B")) {
+ wrkDetl.setMatnr(matnr.substring(1));
+ }
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
if (null != locDetl) {
@@ -169,6 +177,21 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+ } else {
+ LocDetl detl = new LocDetl();
+
+// Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+// detl.sync(mat);
+ detl.sync(wrkDetl);
+ detl.setOrderNo(wrkDetl.getOrderNo());//璁㈠崟缂栧彿
+ detl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+ detl.setAnfme(Math.abs(wrkDetl.getAnfme())); // 鏁伴噺
+ detl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+ detl.setModiTime(now);
+ detl.setAppeTime(now);
+ if (!locDetlService.insert(detl)) {
+ return FAIL.setMsg("琛ユ枡 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
}
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
diff --git a/src/main/resources/mapper/WaitPakinLogMapper.xml b/src/main/resources/mapper/WaitPakinLogMapper.xml
index 543ead5..2a2e4fc 100644
--- a/src/main/resources/mapper/WaitPakinLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakinLogMapper.xml
@@ -47,6 +47,7 @@
<result column="appe_time" property="appeTime" />
<result column="appe_user" property="appeUser" />
<result column="memo" property="memo" />
+ <result column="bom_code" property="bomCode" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index a4a997e..968d4cd 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -45,6 +45,7 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+ <result column="bom_code" property="bomCode" />
</resultMap>
</mapper>
--
Gitblit v1.9.1