From 359ffffec540f2645af8071d5aff0a6cd55db160 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 29 九月 2025 11:14:04 +0800
Subject: [PATCH] 对接

---
 src/main/java/com/zy/third/entity/ExdOutstockTarget.java     |    6 ++++--
 src/main/java/com/zy/third/entity/ExdInstockTarget.java      |    6 ++++--
 src/main/java/com/zy/third/entity/ExdInstockSource.java      |    6 ++++--
 src/main/resources/mapper/third/ExdInstockTargetMapper.xml   |    2 +-
 src/main/resources/mapper/third/ExdOutstockTargetMapper.xml  |    2 +-
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java       |    3 ++-
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   16 ++++++++++------
 src/main/webapp/static/js/user/user.js                       |    2 +-
 src/main/java/com/zy/third/task/handler/BaseDataHandler.java |    7 +++++++
 src/main/resources/mapper/third/ExdOutstockSourceMapper.xml  |    2 +-
 src/main/java/com/zy/third/entity/ExdOutstockSource.java     |    6 ++++--
 src/main/resources/mapper/third/ExdInstockSourceMapper.xml   |    2 +-
 12 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 3c0c526..c0954cd 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -51,7 +51,8 @@
                         log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
                     }
                 }catch (Exception e){
-                    log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                    e.printStackTrace();
+                    log.error("鍗曟嵁[orderNo={}]涓婃姤erp鎶ラ敊", order.getOrderNo());
                 }
             }
         }
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 a4e6f86..4bf9fec 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -54,6 +54,9 @@
             return SUCCESS;
         }
         List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+        if (orderDetls.isEmpty()){
+            return SUCCESS;
+        }
         // 鍏ュ簱瀹屾垚涓婃姤
         if (docType.getPakin() == 1) {
             ExdInstockTarget exdInstockTarge = null;
@@ -69,9 +72,9 @@
                 exdInstockTarge.setWritor("WMS");
                 exdInstockTarge.setStatus(0);
                 exdInstockTargetService.insert(exdInstockTarge);
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
+            }
+            if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
             }
         } else if (docType.getPakout() == 1) {
             // 鍑哄簱瀹屾垚涓婃姤
@@ -94,9 +97,10 @@
                 exdOutstockTarget.setWritor("WMS");
                 exdOutstockTarget.setStatus(0);
                 exdOutstockTargetService.insert(exdOutstockTarget);
-                if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-                }
+
+            }
+            if (!orderService.updateSettle(order.getId(), 6L, null)) {
+                throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
             }
         }
         return SUCCESS;
diff --git a/src/main/java/com/zy/third/entity/ExdInstockSource.java b/src/main/java/com/zy/third/entity/ExdInstockSource.java
index e8c04b3..640366d 100644
--- a/src/main/java/com/zy/third/entity/ExdInstockSource.java
+++ b/src/main/java/com/zy/third/entity/ExdInstockSource.java
@@ -6,6 +6,8 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 
 /**
@@ -18,8 +20,8 @@
     /**
      * 
      */
-    @TableId
-    private Long id;
+    @TableId(value = "ID", type = IdType.AUTO)
+    private String ID;
 
     /**
      * 
diff --git a/src/main/java/com/zy/third/entity/ExdInstockTarget.java b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
index 3cbcf61..b63a482 100644
--- a/src/main/java/com/zy/third/entity/ExdInstockTarget.java
+++ b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
@@ -6,6 +6,8 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 
 /**
@@ -18,8 +20,8 @@
     /**
      * 
      */
-    @TableId
-    private Long id;
+    @TableId(value = "ID", type = IdType.AUTO)
+    private String ID;
 
     /**
      * 
diff --git a/src/main/java/com/zy/third/entity/ExdOutstockSource.java b/src/main/java/com/zy/third/entity/ExdOutstockSource.java
index ba44c15..caee837 100644
--- a/src/main/java/com/zy/third/entity/ExdOutstockSource.java
+++ b/src/main/java/com/zy/third/entity/ExdOutstockSource.java
@@ -6,6 +6,8 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 
 /**
@@ -18,8 +20,8 @@
     /**
      * 
      */
-    @TableId
-    private Long id;
+    @TableId(value = "ID", type = IdType.AUTO)
+    private String ID;
 
     /**
      * 
diff --git a/src/main/java/com/zy/third/entity/ExdOutstockTarget.java b/src/main/java/com/zy/third/entity/ExdOutstockTarget.java
index 31a8690..a9c0b47 100644
--- a/src/main/java/com/zy/third/entity/ExdOutstockTarget.java
+++ b/src/main/java/com/zy/third/entity/ExdOutstockTarget.java
@@ -6,6 +6,8 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 
 /**
@@ -18,8 +20,8 @@
     /**
      * 
      */
-    @TableId
-    private Long id;
+    @TableId(value = "ID", type = IdType.AUTO)
+    private String ID;
 
     /**
      * 
diff --git a/src/main/java/com/zy/third/task/handler/BaseDataHandler.java b/src/main/java/com/zy/third/task/handler/BaseDataHandler.java
index b77f4dd..18cf97b 100644
--- a/src/main/java/com/zy/third/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/third/task/handler/BaseDataHandler.java
@@ -39,10 +39,17 @@
             user.setUsername(exdUser.getName());
             user.setNickname(exdUser.getName());
             user.setMobile(exdUser.getName());
+            user.setEmail(exdUser.getId());
             user.setRoleId(2L);
             user.setCreateTime(new Date());
             user.setStatus(1);
             userService.insert(user);
+        }else {
+            user.setUsername(exdUser.getName());
+            user.setNickname(exdUser.getName());
+            user.setMobile(exdUser.getName());
+            user.setEmail(exdUser.getId());
+            userService.updateById(user);
         }
         return SUCCESS;
     }
diff --git a/src/main/resources/mapper/third/ExdInstockSourceMapper.xml b/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
index b4799be..7cf04df 100644
--- a/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
+++ b/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.zy.third.mapper.ExdInstockSourceMapper">
 
     <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdInstockSource">
-            <id property="id" column="ID" />
+            <id property="ID" column="ID" />
             <result property="finterid" column="FInterID" />
             <result property="fbillno" column="FBillNo" />
             <result property="ftrantype" column="FTranType" />
diff --git a/src/main/resources/mapper/third/ExdInstockTargetMapper.xml b/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
index 02dcfc8..8445198 100644
--- a/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
+++ b/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.zy.third.mapper.ExdInstockTargetMapper">
 
     <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdInstockTarget">
-            <id property="id" column="ID" />
+            <id property="ID" column="ID" />
             <result property="finterid" column="FInterID" />
             <result property="fbillno" column="FBillNo" />
             <result property="ftrantype" column="FTranType" />
diff --git a/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml b/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml
index 2d44a34..9e9bb85 100644
--- a/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml
+++ b/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.zy.third.mapper.ExdOutstockSourceMapper">
 
     <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdOutstockSource">
-            <id property="id" column="ID" />
+            <id property="ID" column="ID" />
             <result property="finterid" column="FInterID" />
             <result property="fbillno" column="FBillNo" />
             <result property="ftrantype" column="FTranType" />
diff --git a/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml b/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml
index 06859e4..91f4db8 100644
--- a/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml
+++ b/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.zy.third.mapper.ExdOutstockTargetMapper">
 
     <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdOutstockTarget">
-            <id property="id" column="ID" />
+            <id property="ID" column="ID" />
             <result property="finterid" column="FInterID" />
             <result property="fbillno" column="FBillNo" />
             <result property="ftrantype" column="FTranType" />
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 0e06c7e..c7fcbb9 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -29,7 +29,7 @@
             ,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
             // ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
             ,{field: 'roleName', align: 'center',title: '瑙掕壊'}
-            ,{field: 'email', align: 'center',title: '閭'}
+            ,{field: 'email', align: 'center',title: 'ERP涓敤鎴穒d'}
             // ,{field: 'sex$', align: 'center',title: '鎬у埆'}
             ,{field: 'createTime$', align: 'center',title: '娉ㄥ唽鏃堕棿', hide: true}
             ,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 120, unresize: true}

--
Gitblit v1.9.1