From b2dc2d7385afbe3efcf5146cb477935783433295 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 21 十月 2023 17:03:04 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderMapper.xml                                  |    9 
 src/main/java/com/zy/asrs/service/OrderService.java                        |    1 
 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java         |   47 ++++
 src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java   |  133 +++++++++++++
 src/main/webapp/static/layuiadmin/json/console/top-card.js                 |   77 -------
 src/main/webapp/static/layuiadmin/json/console/top-search.js               |   47 ----
 src/main/webapp/static/layuiadmin/json/console/prograss.js                 |   37 ---
 src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java |  133 +++++++++++++
 src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java                |   16 
 src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java |   12 
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java               |    5 
 src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java       |   15 -
 src/main/java/com/zy/asrs/mapper/OrderMapper.java                          |    1 
 src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java       |   49 ++++
 src/main/resources/application.yml                                         |   11 
 15 files changed, 407 insertions(+), 186 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 8b38a11..e3770ad 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -15,6 +15,7 @@
     int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
 
     List<Order> selectComplete();
+    List<Order> selectComplete8();
 
     int addToLogTable(Order order);
 
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 5054dd9..44ab470 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -23,6 +23,7 @@
     void remove(Long orderId);
 
     List<Order> selectComplete();
+    List<Order> selectComplete8();
 
     boolean addToLogTable(Order order);
 
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 952e6da..0d63296 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -166,6 +166,11 @@
     }
 
     @Override
+    public List<Order> selectComplete8() {
+        return this.baseMapper.selectComplete8();
+    }
+
+    @Override
     public boolean addToLogTable(Order order) {
         return this.baseMapper.addToLogTable(order) > 0;
     }
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
index 1c79437..2767e9f 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 /**
- * Created by vincent on 2020/7/7
+ * Created by vincent on 2023/10/21
  */
 @Slf4j
 @Component
@@ -25,18 +25,9 @@
     private ReviewOrderSyncHandler reviewOrderSyncHandler;
     @Autowired
     private OrderService orderService;
-    @Autowired
-    private ApiLogService apiLogService;
+
     @Value("${erp.switch.ReviewOrderSwitch}")
     private boolean ReviewOrderSwitch;
-//    @Scheduled(cron = "0 0 1 * * ? ")
-    public void clearApiLog(){
-        try {
-            apiLogService.clearWeekBefore();
-        } catch (Exception e) {
-            log.error("绗笁鏂规帴鍙ｆ棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e);
-        }
-    }
 
     @Scheduled(cron = "0/3 * * * * ? ")
     @Async("orderThreadPool")
@@ -48,7 +39,7 @@
         for (Order order : orders) {
             ReturnT<String> result = reviewOrderSyncHandler.start(order);
             if (!result.isSuccess()) {
-                log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
             }
         }
     }
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
new file mode 100644
index 0000000..932bca7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -0,0 +1,47 @@
+package com.zy.asrs.task.kingdee;
+
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by Monkey D. Luffy on 2023.10.21
+ */
+@Slf4j
+@Component
+public class SaveOrderSyncScheduler {
+
+    @Autowired
+    private SubmitOrderSyncHandler submitOrderSyncHandler;
+    @Autowired
+    private OrderService orderService;
+
+    @Value("${erp.switch.ReviewOrderSwitch}")
+    private boolean ReviewOrderSwitch;
+
+//    @Scheduled(cron = "0/3 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReport(){
+        if (1==1) return;
+        if(!ReviewOrderSwitch){
+            return;
+        }
+        List<Order> orders = orderService.selectComplete8();
+        for (Order order : orders) {
+            ReturnT<String> result = submitOrderSyncHandler.start(order);
+            if (!result.isSuccess()) {
+                log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
new file mode 100644
index 0000000..069489a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -0,0 +1,49 @@
+package com.zy.asrs.task.kingdee;
+
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.kingdee.handler.ReviewOrderSyncHandler;
+import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
+import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by Monkey D. Luffy on 2023.10.21
+ */
+@Slf4j
+@Component
+public class SubmitOrderSyncScheduler {
+
+    @Autowired
+    private SaveOrderSyncHandler saveOrderSyncHandler;
+    @Autowired
+    private OrderService orderService;
+
+    @Value("${erp.switch.ReviewOrderSwitch}")
+    private boolean ReviewOrderSwitch;
+
+    @Scheduled(cron = "0/3 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReport(){
+        if(!ReviewOrderSwitch){
+            return;
+        }
+        List<Order> orders = orderService.selectComplete8();
+        for (Order order : orders) {
+            ReturnT<String> result = saveOrderSyncHandler.start(order);
+            if (!result.isSuccess()) {
+                log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 4387b50..313ebc8 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -32,9 +32,9 @@
     //绔彛
     private String URL;
 
-    @Value("${erp.address.outaddress}")
+    @Value("${erp.address.outaddressAudit}")
     //瀹℃牳鍦板潃
-    private String outaddress;
+    private String outaddressAudit;
 
     @Autowired
     private OrderService orderService;
@@ -72,17 +72,17 @@
             response = new HttpHandler.Builder()
                     .setHeaders(headers)
                     .setUri(URL)
-                    .setPath(outaddress)
+                    .setPath(outaddressAudit)
                     .setJson(add)
                     .build()
                     .doPost();
             JSONObject data = JSON.parseObject(response);
             Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
             String bool=IsSuccess.toString();
-            //涓婃姤瀹屾垚璁㈠崟4杞�6
+            //瀹℃牳瀹屾垚鍘熻鍗�4杞�8  8.瀹℃牳瀹屾垚
             if(bool.equals("true")){
                 success = true;
-                order.setSettle(6L);
+                order.setSettle(8L);
                 orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
             }
         } catch (Exception e) {
@@ -94,7 +94,7 @@
                 // 淇濆瓨鎺ュ彛鏃ュ織
                 apiLogService.save(
                         "瀹℃牳",
-                        URL+ outaddress,
+                        URL+ outaddressAudit,
                         null,
                         "127.0.0.1",
                         add,
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
new file mode 100644
index 0000000..88134a3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -0,0 +1,133 @@
+package com.zy.asrs.task.kingdee.handler;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.HttpHandler;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * Created by Monkey D. Luffy on 2023.10.21
+ */
+@Slf4j
+@Service
+public class SaveOrderSyncHandler extends AbstractHandler<String> {
+    @Value("${erp.address.URL}")
+    //绔彛
+    private String URL;
+
+    @Value("${erp.address.outaddressSave}")
+    //瀹℃牳鍦板潃
+    private String outaddressSave;
+
+    @Autowired
+    private OrderService orderService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private DocTypeService docTypeService;
+    @Autowired
+    private LoginAuthenticationHandler loginAuthenticationHandler;
+
+    @Transactional
+    public ReturnT<String> start(Order order) {
+        //鐧诲綍閲戣澏r
+        ReturnT<String> start = loginAuthenticationHandler.start();
+        DocType docType = docTypeService.selectById(order.getDocType());
+        if (null == docType) {
+            return SUCCESS;
+        }
+        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
+
+        //鏉′欢鎷兼帴
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("Numbers",order.getOrderNo());
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("data", jsonObject);
+        jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
+        String add = jsonObject1.toJSONString();
+        //涓婃姤
+        String response = "";
+        boolean success = false;
+        try {
+            //鑾峰彇Cookie鍊�
+            HashMap<String, Object> headers = new HashMap<>();
+            headers.put("Cookie", start.getContent());
+            response = new HttpHandler.Builder()
+                    .setHeaders(headers)
+                    .setUri(URL)
+                    .setPath(outaddressSave)
+                    .setJson(add)
+                    .build()
+                    .doPost();
+            JSONObject data = JSON.parseObject(response);
+            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
+            String bool=IsSuccess.toString();
+            //淇濆瓨瀹屾垚鍘熻鍗�8杞�6
+            if(bool.equals("true")){
+                success = true;
+                order.setSettle(6L);
+                orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+            }
+        } catch (Exception e) {
+            log.error("fail", e);
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "淇濆瓨",
+                        URL+ outaddressSave,
+                        null,
+                        "127.0.0.1",
+                        add,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+        return SUCCESS;
+    }
+    public static Object findValueByKey(JSONObject json, String key) {
+        Set<String> keySet = json.keySet();
+        for (String k : keySet) {
+            Object v = json.get(k);
+            if (k.equals(key)) {
+                return v;
+            } else if (v instanceof JSONArray) {
+                int size = ((JSONArray) v).size();
+                for (int i = 0; i <= size - 1; i++) {
+                    Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
+                    if (result != null){
+                        return result;
+                    }
+                }
+            } else if (v instanceof JSONObject){
+                Object result = findValueByKey((JSONObject) v, key);
+                if (result != null){
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
new file mode 100644
index 0000000..7e922d6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
@@ -0,0 +1,133 @@
+package com.zy.asrs.task.kingdee.handler;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.HttpHandler;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * Created by Monkey D. Luffy on 2023.10.21
+ */
+@Slf4j
+@Service
+public class SubmitOrderSyncHandler extends AbstractHandler<String> {
+    @Value("${erp.address.URL}")
+    //绔彛
+    private String URL;
+
+    @Value("${erp.address.outaddressSubmit}")
+    //瀹℃牳鍦板潃
+    private String outaddressSubmit;
+
+    @Autowired
+    private OrderService orderService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private DocTypeService docTypeService;
+    @Autowired
+    private LoginAuthenticationHandler loginAuthenticationHandler;
+
+    @Transactional
+    public ReturnT<String> start(Order order) {
+        //鐧诲綍閲戣澏r
+        ReturnT<String> start = loginAuthenticationHandler.start();
+        DocType docType = docTypeService.selectById(order.getDocType());
+        if (null == docType) {
+            return SUCCESS;
+        }
+        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
+
+        //鏉′欢鎷兼帴
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("Numbers",order.getOrderNo());
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("data", jsonObject);
+        jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
+        String add = jsonObject1.toJSONString();
+        //涓婃姤
+        String response = "";
+        boolean success = false;
+        try {
+            //鑾峰彇Cookie鍊�
+            HashMap<String, Object> headers = new HashMap<>();
+            headers.put("Cookie", start.getContent());
+            response = new HttpHandler.Builder()
+                    .setHeaders(headers)
+                    .setUri(URL)
+                    .setPath(outaddressSubmit)
+                    .setJson(add)
+                    .build()
+                    .doPost();
+            JSONObject data = JSON.parseObject(response);
+            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
+            String bool=IsSuccess.toString();
+            //瀹℃牳瀹屾垚鍘熻鍗�8杞�6
+            if(bool.equals("true")){
+                success = true;
+                order.setSettle(6L);
+                orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+            }
+        } catch (Exception e) {
+            log.error("fail", e);
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "鎻愪氦",
+                        URL+ outaddressSubmit,
+                        null,
+                        "127.0.0.1",
+                        add,
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+        return SUCCESS;
+    }
+    public static Object findValueByKey(JSONObject json, String key) {
+        Set<String> keySet = json.keySet();
+        for (String k : keySet) {
+            Object v = json.get(k);
+            if (k.equals(key)) {
+                return v;
+            } else if (v instanceof JSONArray) {
+                int size = ((JSONArray) v).size();
+                for (int i = 0; i <= size - 1; i++) {
+                    Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
+                    if (result != null){
+                        return result;
+                    }
+                }
+            } else if (v instanceof JSONObject){
+                Object result = findValueByKey((JSONObject) v, key);
+                if (result != null){
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index 0fd8e5c..99c3f4b 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -3,25 +3,25 @@
 public enum KingDeeUtilType {
     BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
 //    STK_InStock(1, "閲囪喘鍏ュ簱鍗�","STK_InStock","FRealQty","","",1),
-//    PUR_MRB(2, "閲囪喘閫�鏂�","PUR_MRB","FRMREALQTY","","",1),
-//    PRD_PickMtrl(3, "鐢熶骇棰嗘枡","PRD_PickMtrl","FActualQty","","",1),
-//    PRD_ReturnMtrl(4, "鐢熶骇閫�鏂�","PRD_ReturnMtrl","FQty","","",1),
-//    PRD_FeedMtrl(5, "鐢熶骇琛ユ枡","PRD_FeedMtrl","FActualQty","","",1),
+//    PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
+//    PRD_PickMtrl(3, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","FActualQty","","",1),
+//    PRD_ReturnMtrl(4, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","FQty","","",1),
+//    PRD_FeedMtrl(5, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","FActualQty","","",1),
 //    STK_TransferDirect(6, "鐩存帴璋冩嫧鍗�","STK_TransferDirect","","FQty","",1),
 //    STK_StockCountGain(7, "鐩樼泩鍗�","STK_StockCountGain","FGainQty","","",1),
 //    STK_StockCountLoss(8, "鐩樹簭鍗�","STK_StockCountLoss","FLossQty","","",1),
 //    STK_MisDelivery(9, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",1),
-//    SP_PickMtrl(10, "绠�鍗曠敓浜ч鏂�","SP_PickMtrl","FActualQty","","",1),
-//    SP_ReturnMtrl(11, "绠�鍗曠敓浜ч��鏂�","SP_ReturnMtrl","FQty","","",1),
+//    SP_PickMtrl(10, "绠�鍗曠敓浜ч鏂欏崟","SP_PickMtrl","FActualQty","","",1),
+//    SP_ReturnMtrl(11, "绠�鍗曠敓浜ч��鏂欏崟","SP_ReturnMtrl","FQty","","",1),
 //    SAL_OUTSTOCK(12, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",1),
-//    SAL_RETURNSTOCK(13, "閿�鍞��璐�","SAL_RETURNSTOCK","FRealQty","","",1),
+//    SAL_RETURNSTOCK(13, "閿�鍞��璐у崟","SAL_RETURNSTOCK","FRealQty","","",1),
     SAL_DELIVERYNOTICE(14, "鍙戣揣閫氱煡鍗�","SAL_DELIVERYNOTICE","","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0),
     STK_MISCELLANEOUS(15, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
 //    BD_Supplier(16, "渚涘簲鍟�","BD_Supplier","","","",1),
     PUR_ReceiveBill(17, "鏀舵枡閫氱煡鍗�","PUR_ReceiveBill","","閲囪喘鍏ュ簱鍗�","STK_InStock",1),
     PRD_MORPT(18, "鐢熶骇姹囨姤鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1),
 //    PRD_INSTOCK(19, "鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK","","","",1),
-    SAL_RETURNNOTICE(20, "閫�璐ч�氱煡鍗�","SAL_RETURNNOTICE","","閫�璐у叆搴撳崟","null",1),
+    SAL_RETURNNOTICE(20, "閫�璐ч�氱煡鍗�","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",1),
     STK_OutStockApply(21, "鍑哄簱鐢宠鍗�","STK_OutStockApply","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0),
     ;
     public Integer id;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c21bb59..e146ccf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -66,8 +66,11 @@
 erp:
   #  寮�鍏�
   switch:
-    InboundOrderSwitch: true
+    #鑾峰彇鍗曟嵁寮�鍏�
+    InboundOrderSwitch: false
+    #鐧诲綍鎺ュ彛寮�鍏�
     LoginAuthenticationSwitch: false
+    #涓婃姤銆佸鏍稿崟鎹紑鍏�
     ReviewOrderSwitch: false
   #  鍦板潃
   address:
@@ -76,8 +79,12 @@
     loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
     #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
     inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
+    #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
+    outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
+    #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
+    outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
     #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
-    outaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
   #  鐧诲綍璐﹀彿绠＄悊
   login :
     acctID: "647e849ab6fa0f"
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index f704b63..c1b06a4 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -62,6 +62,15 @@
         order by create_time asc
     </select>
 
+    <select id="selectComplete8" resultMap="BaseResultMap">
+        select top 5 *
+        from man_order
+        where 1=1
+        and settle = 8
+        and status = 1
+        order by create_time asc
+    </select>
+
     <insert id="addToLogTable">
         INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}
     </insert>
diff --git a/src/main/webapp/static/layuiadmin/json/console/prograss.js b/src/main/webapp/static/layuiadmin/json/console/prograss.js
index 13a093b..961c28d 100644
--- a/src/main/webapp/static/layuiadmin/json/console/prograss.js
+++ b/src/main/webapp/static/layuiadmin/json/console/prograss.js
@@ -1,36 +1 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "prograss": "寮�浼�"
-    ,"time": "涓�灏忔椂"
-    ,"complete": "宸插畬鎴�"
-    ,"LAY_CHECKED": true
-  },{
-    "prograss": "椤圭洰寮�鍙�"
-    ,"time": "涓ゅ皬鏃�"
-    ,"complete": "杩涜涓�"
-    ,"LAY_CHECKED": true
-  },{
-    "prograss": "闄悆楗�"
-    ,"time": "涓�灏忔椂"
-    ,"complete": "鏈畬鎴�"
-  },{
-    "prograss": "淇敼灏廱ug"
-    ,"time": "鍗婂皬鏃�"
-    ,"complete": "鏈畬鎴�"
-  },{
-    "prograss": "淇敼澶ug"
-    ,"time": "涓ゅ皬鏃�"
-    ,"complete": "鏈畬鎴�"
-  },{
-    "prograss": "淇敼灏廱ug"
-    ,"time": "鍗婂皬鏃�"
-    ,"complete": "鏈畬鎴�"
-  },{
-    "prograss": "淇敼澶ug"
-    ,"time": "涓ゅ皬鏃�"
-    ,"complete": "鏈畬鎴�"
-  }]
-}
\ No newline at end of file
+{"code":0,"msg":"","count":"100","data":[{"prograss":"寮�浼�","time":"涓�灏忔椂","complete":"宸插畬鎴�","LAY_CHECKED":true},{"prograss":"椤圭洰寮�鍙�","time":"涓ゅ皬鏃�","complete":"杩涜涓�","LAY_CHECKED":true},{"prograss":"闄悆楗�","time":"涓�灏忔椂","complete":"鏈畬鎴�"},{"prograss":"淇敼灏廱ug","time":"鍗婂皬鏃�","complete":"鏈畬鎴�"},{"prograss":"淇敼澶ug","time":"涓ゅ皬鏃�","complete":"鏈畬鎴�"},{"prograss":"淇敼灏廱ug","time":"鍗婂皬鏃�","complete":"鏈畬鎴�"},{"prograss":"淇敼澶ug","time":"涓ゅ皬鏃�","complete":"鏈畬鎴�"}]}
\ No newline at end of file
diff --git a/src/main/webapp/static/layuiadmin/json/console/top-card.js b/src/main/webapp/static/layuiadmin/json/console/top-card.js
index 51ee9bb..aeeeca3 100644
--- a/src/main/webapp/static/layuiadmin/json/console/top-card.js
+++ b/src/main/webapp/static/layuiadmin/json/console/top-card.js
@@ -1,76 +1 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": 111
-    ,"title": "绀惧尯寮�濮嬫帴鍙� 鈥滆禐鍔╁晢骞垮憡鈥� 鎶曟斁"
-    ,"username": "璐ゅ績"
-    ,"channel": "鍏憡"
-    ,"href": "http://fly.layui.com/jie/15697/"
-    ,"crt": 61632
-  },{
-    "id": 222
-    ,"title": "layui 涓�鍛ㄥ勾"
-    ,"username": "鐚悆"
-    ,"channel": "璁ㄨ"
-    ,"href": "http://fly.layui.com/jie/16622/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "鍥涗釜鏈堢殑鍓嶇"
-    ,"username": "fd"
-    ,"channel": "鍒嗕韩"
-    ,"href": "http://fly.layui.com/jie/16651/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�"
-    ,"username": "绾搁鏈�"
-    ,"channel": "鎻愰棶"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�"
-    ,"username": "绾搁鏈�"
-    ,"channel": "鎻愰棶"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�"
-    ,"username": "绾搁鏈�"
-    ,"channel": "鎻愰棶"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�"
-    ,"username": "绾搁鏈�"
-    ,"channel": "鎻愰棶"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�"
-    ,"username": "绾搁鏈�"
-    ,"channel": "鎻愰棶"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�"
-    ,"username": "绾搁鏈�"
-    ,"channel": "鎻愰棶"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�"
-    ,"username": "绾搁鏈�"
-    ,"channel": "鎻愰棶"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  }]
-}
\ No newline at end of file
+{"code":0,"msg":"","count":"100","data":[{"id":111,"title":"绀惧尯寮�濮嬫帴鍙� 鈥滆禐鍔╁晢骞垮憡鈥� 鎶曟斁","username":"璐ゅ績","channel":"鍏憡","href":"http://fly.layui.com/jie/15697/","crt":61632},{"id":222,"title":"layui 涓�鍛ㄥ勾","username":"鐚悆","channel":"璁ㄨ","href":"http://fly.layui.com/jie/16622/","crt":61632},{"id":333,"title":"鍥涗釜鏈堢殑鍓嶇","username":"fd","channel":"鍒嗕韩","href":"http://fly.layui.com/jie/16651/","crt":61632},{"id":333,"title":"濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�","username":"绾搁鏈�","channel":"鎻愰棶","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�","username":"绾搁鏈�","channel":"鎻愰棶","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�","username":"绾搁鏈�","channel":"鎻愰棶","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�","username":"绾搁鏈�","channel":"鎻愰棶","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�","username":"绾搁鏈�","channel":"鎻愰棶","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�","username":"绾搁鏈�","channel":"鎻愰棶","href":"http://fly.layui.com/jie/9352/","crt":61632},{"id":333,"title":"濡備綍璇勪环LayUI鍜屼粬鐨勪綔鑰呴棽蹇�","username":"绾搁鏈�","channel":"鎻愰棶","href":"http://fly.layui.com/jie/9352/","crt":61632}]}
\ No newline at end of file
diff --git a/src/main/webapp/static/layuiadmin/json/console/top-search.js b/src/main/webapp/static/layuiadmin/json/console/top-search.js
index 9750e5e..6a39bfd 100644
--- a/src/main/webapp/static/layuiadmin/json/console/top-search.js
+++ b/src/main/webapp/static/layuiadmin/json/console/top-search.js
@@ -1,46 +1 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "keywords": "璐ゅ績鏄敺鏄コ"
-    ,"frequency": 8520
-    ,"userNums": 2216
-  },{
-    "keywords": "Java绋嬪簭鍛樿兘鎵惧埌濂虫湅鍙嬪悧"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "姝よ〃鏍兼槸闈欐�佹ā鎷熸暟鎹�"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui瀹樻柟鏁欑▼"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui瀹樻柟鏁欑▼"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui瀹樻柟鏁欑▼"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui瀹樻柟鏁欑▼"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui瀹樻柟鏁欑▼"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui瀹樻柟鏁欑▼"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui瀹樻柟鏁欑▼"
-    ,"frequency": 666
-    ,"userNums": 333
-  }]
-}
\ No newline at end of file
+{"code":0,"msg":"","count":"100","data":[{"keywords":"璐ゅ績鏄敺鏄コ","frequency":8520,"userNums":2216},{"keywords":"Java绋嬪簭鍛樿兘鎵惧埌濂虫湅鍙嬪悧","frequency":666,"userNums":333},{"keywords":"姝よ〃鏍兼槸闈欐�佹ā鎷熸暟鎹�","frequency":666,"userNums":333},{"keywords":"layui瀹樻柟鏁欑▼","frequency":666,"userNums":333},{"keywords":"layui瀹樻柟鏁欑▼","frequency":666,"userNums":333},{"keywords":"layui瀹樻柟鏁欑▼","frequency":666,"userNums":333},{"keywords":"layui瀹樻柟鏁欑▼","frequency":666,"userNums":333},{"keywords":"layui瀹樻柟鏁欑▼","frequency":666,"userNums":333},{"keywords":"layui瀹樻柟鏁欑▼","frequency":666,"userNums":333},{"keywords":"layui瀹樻柟鏁欑▼","frequency":666,"userNums":333}]}
\ No newline at end of file

--
Gitblit v1.9.1