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 | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 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 7abf1e0..19f7567 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -73,6 +73,7 @@
if (orderDetls.isEmpty()) {
return SUCCESS;
}
+ boolean boo=false;
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
ExdInstockTarget exdInstockTarge = null;
@@ -80,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) {
// 鍑哄簱瀹屾垚涓婃姤
@@ -105,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;
}
@@ -131,7 +160,7 @@
return FAIL;
}
-
+ int i = 1;
for (OrderDetl1 orderDetl : orderDetls) {
ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getBatch());
@@ -160,7 +189,7 @@
exdOutstockTarget.setFtrantype(21);
//鍗曟嵁鏃ユ湡
- exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+ exdOutstockTarget.setFdate(order.getUpdateTime());
//绾㈣摑瀛�
exdOutstockTarget.setFrob(1);
//鎿嶄綔鐢ㄦ埛
@@ -175,14 +204,14 @@
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);
//鎵瑰彿 鏆傚畾
@@ -205,7 +234,7 @@
//浠撳簱ID
Integer Fdcstockid = 19382;
if(!Cools.isEmpty(bacode.getProdinkind())){
- ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", bacode.getProdinkind()));
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", orderDetl.getBrand()));
Fdcstockid = Integer.valueOf(fname.getId());
}
exdOutstockTarget.setFdcstockid(Fdcstockid);
--
Gitblit v1.9.1