From 91831843f3b9fa4c9f29e518e10dae5d3f9aead8 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 10:40:51 +0800
Subject: [PATCH] 增加几种出入库单类型

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index a1c7793..c8a55b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -59,8 +59,6 @@
     @Autowired
     private PurchaseService purchaseService;
     @Autowired
-    private RemotesInfoProperties.ApiInfo apiInfo;
-    @Autowired
     private RestTemplate restTemplate;
     @Autowired
     private RemotesInfoProperties remotesInfoProperties;
@@ -123,7 +121,7 @@
         if (!remotesInfoProperties.getHost().equals("http://127.0.0.1")){
             MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
             //鑾峰彇涓婃姤璐ㄦ鎺ュ彛
-            String url = remotesInfoProperties.getBaseUrl() + apiInfo.getNotifyInspect();
+            String url = remotesInfoProperties.getBaseUrl() + remotesInfoProperties.getApi().getNotifyInspect();
             // 璁剧疆璇锋眰鍙傛暟
             params.add("params", JSONObject.toJSONString(inspectParams));
             log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", url, JSONObject.toJSONString(inspectParams));
@@ -339,8 +337,9 @@
                     //璋冩嫈鍏ュ簱鍗�
                     params.setOrderType("Mv_Instock").setAction("Update");
 
-                } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
-                    //鐢熶骇鍏ュ簱鍗�
+                } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)
+                        || order.getWkType().equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
+                    //鐢熶骇鍏ュ簱鍗� / B017 鐢熶骇鍏ュ簱
 //                params.setOrderType("WO_Outstock").setAction("Update");
                 } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
                     //鐢熶骇閫�鏂�
@@ -427,8 +426,9 @@
                     } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
                         //璋冩嫈鍏ュ簱鍗�
                         params.setOrderType("Mv_Instock").setAction("Update");
-                    } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
-                        //鐢熶骇鍏ュ簱鍗�
+                    } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)
+                            || order.getWkType().equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
+                        //鐢熶骇鍏ュ簱鍗� / B017 鐢熶骇鍏ュ簱
 //                      params.setOrderType("WO_Outstock").setAction("Update");
                     } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
                         //鐢熶骇閫�鏂�
@@ -545,8 +545,9 @@
             //璋冩嫈鍏ュ簱鍗�
             params.setOrderType("Mv_Instock").setAction("Update");
             param.setInQty(orderItem.getQty());
-        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
-            //鐢熶骇鍏ュ簱鍗�
+        } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)
+                || order.getWkType().equalsIgnoreCase(OrderWorkType.ORDER_WORK_TYPE_PROD_B017.type)) {
+            //鐢熶骇鍏ュ簱鍗� / B017 鐢熶骇鍏ュ簱
 //                params.setOrderType("WO_Outstock").setAction("Update");
         } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
             //鐢熶骇閫�鏂�

--
Gitblit v1.9.1