From 7102e9faca7b1cc6da94be325831c13d0301d7f6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 14:42:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 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 949255e..c5961b2 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -90,9 +90,9 @@
                     decType = 1;
                 }
                 exdInstockTarge.setFtrantype(decType);
-                exdInstockTarge.setFdate(DateUtils.convert(order.getOrderTime()));
+                exdInstockTarge.setFdate(order.getUpdateTime());
                 Integer frob = 1;
-                if(order.getDocType().intValue()==21||order.getDocType().intValue()==24||order.getDocType().intValue()==2||order.getDocType().intValue()==3){
+                if(order.getDocType().intValue()==21||order.getDocType().intValue()==24){
                     frob = -1;
                 }
                 exdInstockTarge.setFrob(frob);
@@ -103,7 +103,10 @@
                 exdInstockTarge.setWritor("WMS");
                 exdInstockTarge.setStatus(0);
                 exdInstockTarge.setProdinkind(orderDetl.getItemNum());
-                exdInstockTargetService.insert(exdInstockTarge);
+                if(exdInstockTargetService.insert(exdInstockTarge)){
+                    log.info("鍏ュ簱璁㈠崟瀹屾垚鎻掑叆涓棿琛紝鏁版嵁={}",exdInstockTarge);
+                    break;
+                }
             }
             if (!orderService.updateSettle(order.getId(), 6L, null)) {
                 throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
@@ -119,11 +122,19 @@
                 exdOutstockTarget.setFbillno(orderDetl.getOrderNo());
                 if (order.getDocType() == 42) {
                     exdOutstockTarget.setFtrantype(41);
-                } else {
+                } else if(order.getDocType() == 3){
+                    exdOutstockTarget.setFtrantype(1);
+                }else if(order.getDocType() == 25){
+                    exdOutstockTarget.setFtrantype(24);
+                }else{
                     exdOutstockTarget.setFtrantype(order.getDocType().intValue());
                 }
                 exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
-                exdOutstockTarget.setFrob(order.getDocType().intValue()==2? -1:1);
+                Integer frob = 1;
+                if (order.getDocType().intValue()==2 || order.getDocType().intValue()==3){
+                    frob = -1;
+                }
+                exdOutstockTarget.setFrob(frob);
                 //鎿嶄綔鐢ㄦ埛
                 User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getUpdateBy()));
                 exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
@@ -131,8 +142,10 @@
                 exdOutstockTarget.setWritor("WMS");
                 exdOutstockTarget.setStatus(0);
                 exdOutstockTarget.setProdinkind(orderDetl.getItemNum());
-                exdOutstockTargetService.insert(exdOutstockTarget);
-
+                if(exdOutstockTargetService.insert(exdOutstockTarget)){
+                    log.info("鍑哄簱璁㈠崟瀹屾垚鎻掑叆涓棿琛紝鏁版嵁={}",exdOutstockTarget);
+                    break;
+                }
             }
             if (!orderService.updateSettle(order.getId(), 6L, null)) {
                 throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
@@ -189,7 +202,7 @@
             exdOutstockTarget.setFtrantype(21);
 
             //鍗曟嵁鏃ユ湡
-            exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+            exdOutstockTarget.setFdate(order.getUpdateTime());
             //绾㈣摑瀛�
             exdOutstockTarget.setFrob(1);
             //鎿嶄綔鐢ㄦ埛
@@ -234,7 +247,7 @@
             //浠撳簱ID
             Integer Fdcstockid = 19382;
             if(!Cools.isEmpty(bacode.getProdinkind())){
-                ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", orderDetl.getBrand()));
+                ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fnumber", bacode.getProdinkind()));
                 Fdcstockid = Integer.valueOf(fname.getId());
             }
             exdOutstockTarget.setFdcstockid(Fdcstockid);

--
Gitblit v1.9.1