From 1cea8144b4ddd9ed19f8e2542b5374ca13c030f4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 22 十二月 2023 15:42:44 +0800
Subject: [PATCH] Merge branch 'hzjzwms' of http://47.97.1.152:5880/r/zy-asrs into tzhnewms
---
src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java | 80 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
index 05f9116..2e7c3c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.ExamineParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.mapper.OrderCheckMapper;
@@ -19,6 +21,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -40,6 +43,14 @@
@Autowired
private LocCheckService locCheckService;
+
+ @Autowired
+ private ManLocDetlService manLocDetlService;
+
+ @Autowired
+ private NodeService nodeService;
+ @Autowired
+ private OrderCheckService orderCheckService;
@Override
public OrderCheck selectByNo(String orderNo) {
@@ -76,8 +87,9 @@
}
if (complete) {
for (OrderDetl orderDetl : orderDetls) {
- //鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
- if (orderDetl.getBatch().equals("")){
+ if (Cools.isEmpty(orderDetl.getBatch())){
+ orderDetlService.updateById(orderDetl);
+ }else if (orderDetl.getBatch().equals("")){//鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
orderDetl.setBatch(null);
orderDetlService.updateById(orderDetl);
}
@@ -178,5 +190,69 @@
locCheckService.delete(new EntityWrapper<LocCheck>().eq("order_no", orderNo));
}
+ @Override
+ public R examine(ExamineParam param) {
+ for (ExamineParam.data list:param.getList()){
+ EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("matnr", list.getMatnr())
+ .eq("loc_no", list.getLocNo())
+ .eq("batch", list.getBatch());
+
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
+ if (manLocDetl == null){
+ Date now = new Date();
+
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", list.getLocNo()));
+
+ ManLocDetl manLocDetl1 = new ManLocDetl();
+
+ manLocDetl1.setLocNo(list.getLocNo());
+ manLocDetl1.setNodeId(node.getId());
+ manLocDetl1.setAnfme(list.getRealAnfme());
+ manLocDetl1.setMatnr(list.getMatnr());
+ manLocDetl1.setMaktx(list.getMaktx());
+ manLocDetl1.setStatus(1);
+ manLocDetl1.setCreateTime(now);
+ manLocDetl1.setModiTime(now);
+ manLocDetl1.setOrderNo(list.getOrderNo());
+ manLocDetl1.setStockFreeze(1);
+ manLocDetl1.setBatch(list.getBatch());
+
+ if (!manLocDetlService.insert(manLocDetl1)){
+ return R.error("鎻掑叆鏁版嵁澶辫触");
+ }
+
+ }else {
+ if (list.getRealAnfme() == 0){
+ if (!manLocDetlService.delete(wrapper)){
+ return R.error("鍒犻櫎鏁版嵁澶辫触锛�");
+ }
+ }else {
+ manLocDetl.setAnfme(list.getRealAnfme());
+ if (!manLocDetlService.update(manLocDetl,wrapper)){
+ return R.error("鏇存柊搴撳瓨鏁伴噺澶辫触锛�");
+ }
+ }
+ }
+
+ EntityWrapper<LocCheck> wrapper2 = new EntityWrapper<>();
+ wrapper2.eq("order_no", list.getOrderNo())
+ .eq("matnr", list.getMatnr())
+ .eq("loc_no", list.getLocNo());
+ LocCheck checkDetl = locCheckService.selectOne(wrapper2);
+ checkDetl.setType(2);
+ if (!locCheckService.update(checkDetl,wrapper2)){
+ return R.error("鏇存柊鐩樼偣鏄庣粏澶辫触锛�");
+ }
+ }
+ OrderCheck orderCheck = orderCheckService.selectOne(new EntityWrapper<OrderCheck>().eq("order_no", param.getOrderNo()));
+ orderCheck.setSettle(4L);
+ if (!orderCheckService.update(orderCheck,new EntityWrapper<OrderCheck>().eq("order_no", param.getOrderNo()))){
+ return R.error("鏇存柊鐩樼偣鍗曠姸鎬佸け璐ワ紒");
+ }
+
+ return R.ok();
+}
+
}
--
Gitblit v1.9.1