From 40e24ffdfc95c186bccc24c2bc99a0ffcfec73e3 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 10:48:21 +0800
Subject: [PATCH] 订单组托代码

---
 src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index 06099e3..e803553 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -1,8 +1,9 @@
 package com.zy.third.erp.task;
 
 import com.zy.common.service.erp.ErpSqlServer;
-import com.zy.third.erp.entity.InDetTB;
-import com.zy.third.erp.entity.InHedTB;
+import com.zy.third.erp.entity.OutDetTB;
+import com.zy.third.erp.entity.OutHedTB;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -16,6 +17,7 @@
 /**
  * 鍏ュ簱鍗曟嵁
  */
+@Slf4j
 @Component
 public class ERPOutHedTBScheduler {
 
@@ -24,27 +26,31 @@
 
 
     @Autowired
-    private ERPInOrOutTBSchedulerMS inMS;
+    private ERPInOrOutService inMS;
 
 
     @Autowired
     private ErpSqlServer erpSqlServer;
 
+
+    @Transactional(rollbackFor = Throwable.class)
     @Scheduled(cron = "${erp.refreshtime}")
-    public void ItemScheduler() {
+    public void OutHedTBScheduler() {
+        //log.info("OutHedTBScheduler寮�濮嬩簡");
         if (!erpEnabled) return;
         String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡'";
-        List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
-        if (inHeds.size() > 0) {
-            for (InHedTB inHed : inHeds) {
+        List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
+        if (!inHeds.isEmpty()) {
+            for (OutHedTB inHed : inHeds) {
                 HashMap<String, String> condition = new HashMap<>();
                 condition.put("BillNo", "'" + inHed.getBillNo() + "'");
-                List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
+                List<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
                 HashMap<String, Object> hedAndDet = new HashMap<>();
                 hedAndDet.put("hed", inHed);
                 hedAndDet.put("det", inDetTBS);
-                boolean result = inMS.createOrder(inHed, inDetTBS);
+                boolean result = inMS.createOutOrder(inHed, inDetTBS);
                 if (result) {
+                    log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed.getBillNo());
                     move(hedAndDet);
                 } else {
                     String sql = "UPDATE erp_OutHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
@@ -54,20 +60,18 @@
         }
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Throwable.class)
     public void move(HashMap<String, Object> hedAndDet) {
-        InHedTB hed = (InHedTB) hedAndDet.get("hed");
-        ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det");
+        OutHedTB hed = (OutHedTB) hedAndDet.get("hed");
+        ArrayList<OutDetTB> dets = (ArrayList<OutDetTB>) hedAndDet.get("det");
         HashMap<String, String> condition = new HashMap<>();
         condition.put("BillNo", "'" + hed.getBillNo() + "'");
-        erpSqlServer.delete(InHedTB.class, condition);
-
-        for (InDetTB det : dets) {
+        erpSqlServer.delete(OutHedTB.class, condition);
+        for (OutDetTB det : dets) {
             HashMap<String, String> condition2 = new HashMap<>();
             condition2.put("BillNo", "'" + det.getBillNo() + "'");
             condition2.put("iNo", String.valueOf(det.getINO()));
-            erpSqlServer.delete(InDetTB.class, condition2);
-
+            erpSqlServer.delete(OutDetTB.class, condition2);
         }
 
     }

--
Gitblit v1.9.1