From f60955e2ffe9b183e72911e361fa0632e3c780c7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 16 一月 2026 08:23:35 +0800
Subject: [PATCH] 修复订单上报订单完成时间
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 123 ++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index fdf3095..19f7567 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task.handler;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
@@ -8,12 +9,14 @@
import com.zy.asrs.service.impl.OrderDetl1ServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.third.entity.ExdInstockTarget;
-import com.zy.third.entity.ExdOutstockTarget;
-import com.zy.third.entity.ExdvYanbu;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import com.zy.third.entity.*;
import com.zy.third.mapper.ExdMaterialMapper;
import com.zy.third.service.ExdInstockTargetService;
+import com.zy.third.service.ExdOutstockSourceService;
import com.zy.third.service.ExdOutstockTargetService;
+import com.zy.third.service.ExdStockService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -53,6 +56,12 @@
private ExdMaterialMapper exdMaterialMapper;
@Autowired
private Order1Service order1Service;
+ @Autowired
+ private ExdOutstockSourceService exdOutstockSourceService;
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private ExdStockService exdStockService;
@Transactional
public ReturnT<String> start(Order order) {
@@ -64,6 +73,7 @@
if (orderDetls.isEmpty()) {
return SUCCESS;
}
+ boolean boo=false;
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
ExdInstockTarget exdInstockTarge = null;
@@ -71,17 +81,34 @@
exdInstockTarge = new ExdInstockTarget();
exdInstockTarge.setFinterid(orderDetl.getDeadWarn());
exdInstockTarge.setFbillno(orderDetl.getOrderNo());
- exdInstockTarge.setFtrantype(order.getDocType().intValue());
- exdInstockTarge.setFdate(DateUtils.convert(order.getOrderTime()));
- exdInstockTarge.setFrob(orderDetl.getInspect());
- exdInstockTarge.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ Integer decType = order.getDocType().intValue();
+ if(order.getDocType().intValue()==42){
+ decType = 41;
+ }else if(order.getDocType().intValue()==25){
+ decType = 24;
+ }else if(order.getDocType().intValue()==3){
+ decType = 1;
+ }
+ exdInstockTarge.setFtrantype(decType);
+ exdInstockTarge.setFdate(order.getUpdateTime());
+ Integer frob = 1;
+ if(order.getDocType().intValue()==21||order.getDocType().intValue()==24||order.getDocType().intValue()==2||order.getDocType().intValue()==3){
+ frob = -1;
+ }
+ exdInstockTarge.setFrob(frob);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getUpdateBy()));
+ exdInstockTarge.setFuserid(Integer.valueOf(id.getEmail()));
exdInstockTarge.setWritetime(new Date());
exdInstockTarge.setWritor("WMS");
exdInstockTarge.setStatus(0);
+ exdInstockTarge.setProdinkind(orderDetl.getItemNum());
exdInstockTargetService.insert(exdInstockTarge);
}
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }else {
+// boo = true;
}
} else if (docType.getPakout() == 1) {
// 鍑哄簱瀹屾垚涓婃姤
@@ -96,17 +123,28 @@
exdOutstockTarget.setFtrantype(order.getDocType().intValue());
}
exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
- exdOutstockTarget.setFrob(orderDetl.getInspect());
- exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ exdOutstockTarget.setFrob(order.getDocType().intValue()==2? -1:1);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getUpdateBy()));
+ exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
exdOutstockTarget.setWritetime(new Date());
exdOutstockTarget.setWritor("WMS");
exdOutstockTarget.setStatus(0);
+ exdOutstockTarget.setProdinkind(orderDetl.getItemNum());
exdOutstockTargetService.insert(exdOutstockTarget);
}
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }else {
+ boo = true;
}
+ }
+ //鏅�氬叆鍑鸿鍗曞瓙鍗曞畬鎴�
+ if (boo){
+ Order1 orderNo = order1Service.selectOne(new EntityWrapper<Order1>().like("order_no", order.getOrderNo()));
+ orderNo.setSettle(6L);
+ order1Service.update(orderNo,new EntityWrapper<Order1>().eq("order_no",order.getOrderNo()));
}
return SUCCESS;
}
@@ -122,12 +160,12 @@
return FAIL;
}
-
+ int i = 1;
for (OrderDetl1 orderDetl : orderDetls) {
- ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getThreeCode());
+ ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getBatch());
//鑾峰彇涓昏〃鏄庣粏
- OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo(), orderDetl.getMatnr(), null);
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
//涓婃姤鏁伴噺
BigDecimal anfme = new BigDecimal(orderDetl1.getAnfme());
BigDecimal Units = new BigDecimal((Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
@@ -147,22 +185,33 @@
//鍗曞彿 = erp璁㈠崟鍙�+鐗╂枡缂栧彿+涓婃姤娆℃暟
exdOutstockTarget.setFbillno(order.getOrderNo());
+ //鍗曟嵁绫诲瀷
+ exdOutstockTarget.setFtrantype(21);
+
+ //鍗曟嵁鏃ユ湡
+ exdOutstockTarget.setFdate(order.getUpdateTime());
+ //绾㈣摑瀛�
+ exdOutstockTarget.setFrob(1);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getCreateBy()));
+ exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
+
//閮ㄩ棬ID
exdOutstockTarget.setFdeptid(7502);
//渚涘簲鍟�/瀹㈡埛ID
exdOutstockTarget.setFsupplyid(0);
//鍒跺崟鐢ㄦ埛ID
- exdOutstockTarget.setFbillerid(Math.toIntExact(orderDetl.getUpdateBy()));
+ exdOutstockTarget.setFbillerid(Integer.valueOf(id.getEmail()));
//缁嗚〃ID
Integer c = Integer.valueOf(order.getOrderNo().split("-")[1]);
- exdOutstockTarget.setFentryid(c);
+ exdOutstockTarget.setFentryid(i++);
//鐗╂枡ID
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
exdOutstockTarget.setFitemid(Integer.valueOf(mat.getUuid()));
//婧愬崟鏁伴噺
exdOutstockTarget.setFqtymust(count);
//鍑哄簱鏁伴噺
- exdOutstockTarget.setFqty(orderDetl.getQty());
+ exdOutstockTarget.setFqty(bacode.getQty());
//鍗曚环
exdOutstockTarget.setFprice(0.0);
//鎵瑰彿 鏆傚畾
@@ -170,35 +219,35 @@
//鍗曚綅ID
exdOutstockTarget.setFunitid(0);
//婧愬崟鍙�
- exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo());
- //婧愬崟缁嗚〃ID 鏆傚畾
- exdOutstockTarget.setFsourceentryid(0);
- //婧愬崟鍐呯爜 鏆傚畾
- exdOutstockTarget.setFsourceinterid(0);
+ exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo().split("-")[0]);
+ ExdOutstockSource exdOutstockSource = exdOutstockSourceService.selectOne(new EntityWrapper<ExdOutstockSource>()
+ .eq("FBillNo", orderDetl.getOrderNo().split("-")[0])
+ .eq("FItemID", mat.getUuid()));
+ //婧愬崟缁嗚〃ID
+ exdOutstockTarget.setFsourceentryid(exdOutstockSource.getFentryid());
+ //婧愬崟鍐呯爜
+ exdOutstockTarget.setFsourceinterid(exdOutstockSource.getFinterid());
//婧愬崟鍗曟嵁绫诲瀷
- exdOutstockTarget.setFsourcetrantype(0);
+ exdOutstockTarget.setFsourcetrantype(81);
//搴撲綅ID
exdOutstockTarget.setFdcspid(0);
- //浠撳簱ID 鏆傚畾
- exdOutstockTarget.setFdcstockid(0);
+ //浠撳簱ID
+ Integer Fdcstockid = 19382;
+ if(!Cools.isEmpty(bacode.getProdinkind())){
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", orderDetl.getBrand()));
+ Fdcstockid = Integer.valueOf(fname.getId());
+ }
+ exdOutstockTarget.setFdcstockid(Fdcstockid);
//閿�鍞鍗曞崟鍙� 鏆傚畾
- exdOutstockTarget.setForderbillno(orderDetl.getOrderNo());
+ exdOutstockTarget.setForderbillno(exdOutstockSource.getForderbillno());
//閿�鍞鍗曠粏琛↖D 鏆傚畾
- exdOutstockTarget.setForderentryid(0);
+ exdOutstockTarget.setForderentryid(exdOutstockSource.getForderentryid());
//閿�鍞鍗曞唴鐮� 鏆傚畾
- exdOutstockTarget.setForderinterid(0);
+ exdOutstockTarget.setForderinterid(exdOutstockSource.getForderinterid());
//璁″垝妯″紡
exdOutstockTarget.setFplanmode(0);
- //鍗曟嵁绫诲瀷
- exdOutstockTarget.setFtrantype(21);
- //鍗曟嵁鏃ユ湡
- exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
- //绾㈣摑瀛�
- exdOutstockTarget.setFrob(orderDetl.getBeBatch());
- //鎿嶄綔鐢ㄦ埛
- exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
exdOutstockTarget.setBarcode(orderDetl.getBatch());
exdOutstockTarget.setGross(BigDecimal.valueOf(bacode.getGross()));
@@ -225,10 +274,10 @@
}
}
for (OrderDetl1 orderDetl : orderDetls) {
- OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo(), orderDetl.getMatnr(), null);
- orderDetl1.setUnits(orderDetl.getAnfme() + (Cools.isEmpty(orderDetl.getUnits()) ? 0.0 : orderDetl.getUnits()));
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
+ orderDetl1.setUnits(orderDetl.getAnfme() + (Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
orderDetl1.setUpdateTime(new Date());
- orderDetl1Service.updateById(orderDetl);
+ orderDetlService.updateById(orderDetl1);
}
return SUCCESS;
}
--
Gitblit v1.9.1