From fc6a73660fb4c76a2b0479bb8108768b7ff0d146 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 21 八月 2025 16:47:42 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/OrderMapper.xml                    |    4 ++--
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java       |    2 +-
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   11 ++++++++---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java   |   14 ++++++++------
 src/main/java/com/zy/asrs/controller/PackController.java     |    4 ++--
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java  |   12 ++++++------
 6 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 542d0a8..6347d91 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -79,7 +79,7 @@
         pack.setCreateBy(getUserId());
         pack.setCreateTime(now);
         if (!packService.insert(pack)) {
-            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+            throw new CoolException("man_pack鍒涘缓寮傚父锛岃鑱旂郴绠$悊鍛�");
         }
         Mat mat = new Mat();
         mat.setTagId(tagService.getTop().getId());
@@ -90,7 +90,7 @@
         mat.setUpdateTime(now);
         mat.setMemo("鎵撳寘涓婄嚎");
         if (!matService.insert(mat)) {
-            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+            throw new CoolException("鐗╂枡淇℃伅鍒涘缓寮傚父锛岃鑱旂郴绠$悊鍛�");
         }
         return R.ok();
     }
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 439d873..64997b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -427,7 +427,7 @@
                             null    // 澶囨敞
                     );
                     if (tagMapper.insert(priTag) == 0) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        throw new CoolException("涓�绾у垎绫诲垱寤哄紓甯革紝璇疯仈绯荤鐞嗗憳");
                     }
                 }
                 // 浜岀骇鍒嗙被
@@ -457,7 +457,7 @@
                             null    // 澶囨敞
                     );
                     if (tagMapper.insert(secTag) == 0) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        throw new CoolException("浜岀骇鍒嗙被鍒涘缓寮傚父锛岃鑱旂郴绠$悊鍛�");
                     }
                 }
                 tagId = secTag.getId();
@@ -473,7 +473,7 @@
             mat.setCreateTime(now);
             mat.setUpdateTime(now);
             if (!matService.insert(mat)) {
-                throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                throw new CoolException("鐗╂枡淇℃伅鏂板寮傚父锛岃鑱旂郴绠$悊鍛�");
             } else {
                 log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
             }
@@ -527,7 +527,7 @@
                                 null    // 澶囨敞
                         );
                         if (tagMapper.insert(priTag) == 0) {
-                            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                            throw new CoolException("涓�绾у垎绫诲垱寤哄紓甯革紝璇疯仈绯荤鐞嗗憳");
                         }
                     }
                     // 浜岀骇鍒嗙被
@@ -557,7 +557,7 @@
                                 null    // 澶囨敞
                         );
                         if (tagMapper.insert(secTag) == 0) {
-                            throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                            throw new CoolException("浜岀骇鍒嗙被鍒涘缓寮傚父锛岃鑱旂郴绠$悊鍛�");
                         }
                     }
                     tagId = secTag.getId();
@@ -575,7 +575,7 @@
                 mat.setCreateTime(now);
                 mat.setUpdateTime(now);
                 if (!matService.insert(mat)) {
-                    throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                    throw new CoolException("鏂板鐗╂枡淇℃伅寮傚父锛岃鑱旂郴绠$悊鍛�");
                 } else {
                     log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
                 }
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 61004e9..1619b74 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -38,7 +38,7 @@
         }
     }
 
-//    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
         String erpReport = Parameter.get().getErpReport();
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 43b50b1..7e7c635 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -24,6 +24,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -75,21 +76,25 @@
                     success = true;
                     // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
                     if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        throw new CoolException("涓婃姤瀹屾垚鏇存柊璁㈠崟鐘舵�佸紓甯革紝璇疯仈绯荤鐞嗗憳");
                     }
                 } else {
                     log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
+                    order.setUpdateTime(new Date());
+                    orderService.updateById(order);
                     throw new CoolException("涓婃姤mes绯荤粺澶辫触");
                 }
             } catch (Exception e) {
                 log.error("fail", e);
 //            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                order.setUpdateTime(new Date());
+                orderService.updateById(order);
                 return FAIL.setMsg(e.getMessage());
             } finally {
                 try {
                     // 淇濆瓨鎺ュ彛鏃ュ織
                     apiLogService.save(
-                            "鎴愬搧搴撳叆搴撲笂鎶�",
+                            "鑳舵枡鍏ュ簱涓婃姤鑷矱RP",
                             MesConstant.URL + MesConstant.PAKIN_URL,
                             null,
                             "127.0.0.1",
@@ -129,7 +134,7 @@
                     success = true;
                     // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
                     if (!orderService.updateSettle(order.getId(), 6L, null)) {
-                        throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+                        throw new CoolException("涓婃姤瀹屾垚鏇存柊璁㈠崟鐘舵�佸紓甯革紝璇疯仈绯荤鐞嗗憳");
                     }
                 } else {
                     log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 35c3e9f..73dfd81 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -83,12 +83,14 @@
                             log.error("鍒犻櫎鍏ュ簱閫氱煡妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
                         }
                     }
-//                    // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
-//                    if (!Cools.isEmpty(wrkDetls)) {
-//                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
-//                            exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
-//                        }
-//                    }
+                    if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
+                        // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
+                        if (!Cools.isEmpty(wrkDetls)) {
+                            if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
+                                exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+                            }
+                        }
+                    }
                 // 鎷f枡鍐嶅叆搴�
                 } else if (wrkMast.getIoType() == 53) {
 //                    if (!Cools.isEmpty(wrkDetls)) {
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index f704b63..c836d98 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -54,12 +54,12 @@
     </update>
 
     <select id="selectComplete" resultMap="BaseResultMap">
-        select top 5 *
+        select top 10 *
         from man_order
         where 1=1
         and settle = 4
         and status = 1
-        order by create_time asc
+        order by update_time asc
     </select>
 
     <insert id="addToLogTable">

--
Gitblit v1.9.1