From 85ef8fe5827bce822c9e74ab0a6a9340a4bae016 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 27 六月 2025 14:18:57 +0800
Subject: [PATCH] erp对接

---
 src/main/java/com/zy/asrs/entity/result/OrderResult.java    |   51 +++++
 src/main/java/com/zy/asrs/entity/OrderDetl.java             |   81 ++++----
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   48 ++++
 src/main/java/com/zy/asrs/task/CollectOrdersScheduler.java  |  193 +++++++++++++++++++++
 src/main/java/com/zy/asrs/task/ERPReportScheduler.java      |  138 +++++++++++++++
 src/main/resources/application.yml                          |   10 +
 6 files changed, 477 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f79f0b6..3cc397c 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -77,9 +77,9 @@
     private String maktx;
 
     /**
-     * 搴忓垪鐮�
+     * 鎵瑰彿
      */
-    @ApiModelProperty(value= "搴忓垪鐮�")
+    @ApiModelProperty(value= "鎵瑰彿")
     private String batch;
 
     /**
@@ -89,28 +89,59 @@
     private String specs;
 
     /**
-     * 鍨嬪彿
+     * 缁勭粐缂栫爜
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "缁勭粐缂栫爜")
+    private String manu;
+
+    /**
+     * 椤规
+     */
+    @ApiModelProperty(value= "椤规")
     private String model;
 
     /**
-     * 棰滆壊
+     * 浠诲姟浠撳簱
      */
-    @ApiModelProperty(value= "棰滆壊")
+    @ApiModelProperty(value= "浠诲姟浠撳簱")
     private String color;
 
     /**
-     * 鍝佺墝
+     * 浠诲姟鍌ㄤ綅
      */
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value= "浠诲姟鍌ㄤ綅")
     private String brand;
 
     /**
-     * 鍗曚綅
+     * 鍗曚綅缂栫爜
      */
-    @ApiModelProperty(value= "鍗曚綅")
+    @ApiModelProperty(value= "鍗曚綅缂栫爜")
     private String unit;
+
+    /**
+     * 鍗曚綅鍚嶇О
+     */
+    @ApiModelProperty(value= "鍗曚綅鍚嶇О")
+    private String sku;
+
+    /**
+     * 渚涘簲鍟嗙紪鐮�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @TableField("item_num")
+    private String itemNum;
+
+    /**
+     * 鎵樼洏鐮�
+     */
+    @ApiModelProperty(value= "鎵樼洏鐮�")
+    private String barcode;
+
+    /**
+     * 渚涘簲鍟嗗悕绉�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
+    private String origin;
 
     /**
      * 鍗曚环
@@ -119,34 +150,11 @@
     private Double price;
 
     /**
-     * sku
-     */
-    @ApiModelProperty(value= "sku")
-    private String sku;
-
-    /**
      * 鍗曚綅閲�
      */
     @ApiModelProperty(value= "鍗曚綅閲�")
     private Double units;
 
-    /**
-     * 鏉$爜
-     */
-    @ApiModelProperty(value= "鏉$爜")
-    private String barcode;
-
-    /**
-     * 浜у湴
-     */
-    @ApiModelProperty(value= "浜у湴")
-    private String origin;
-
-    /**
-     * 鍘傚
-     */
-    @ApiModelProperty(value= "鍘傚")
-    private String manu;
 
     /**
      * 鐢熶骇鏃ユ湡
@@ -154,13 +162,6 @@
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
     private String manuDate;
-
-    /**
-     * 鍝侀」鏁�
-     */
-    @ApiModelProperty(value= "鍝侀」鏁�")
-    @TableField("item_num")
-    private String itemNum;
 
     /**
      * 瀹夊叏搴撳瓨閲�
diff --git a/src/main/java/com/zy/asrs/entity/result/OrderResult.java b/src/main/java/com/zy/asrs/entity/result/OrderResult.java
new file mode 100644
index 0000000..9482708
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/OrderResult.java
@@ -0,0 +1,51 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+@Data
+public class OrderResult {
+    //缁勭粐缂栫爜
+    private String orgNo;
+
+    //鍗曟嵁绫诲埆
+    private String docType;
+
+    //璁㈠崟缂栧彿
+    private String docNo;
+
+    //椤规锛堣鍙凤級
+    private String docSeqNo;
+
+    //浠诲姟浠撳簱
+    private String docWarehouseNo;
+
+    //浠诲姟鍌ㄤ綅
+    private String docCellNo;
+
+    //浠诲姟鎵规
+    private String docLotNo;
+
+    //鐗╂枡缂栫爜
+    private String itemNo;
+
+    //鍝佸悕
+    private String itemName;
+
+    //瑙勬牸
+    private String itemSpec;
+
+    //鍏ュ簱鏁伴噺
+    private double applyQty;
+
+    //鍗曚綅缂栫爜
+    private String unitNo;
+
+    //鍗曚綅鍚嶇О
+    private String unitName;
+
+    //渚涘簲鍟嗙紪鐮�
+    private String supplierNo;
+
+    //渚涘簲鍟嗗悕绉�
+    private String supplierName;
+}
diff --git a/src/main/java/com/zy/asrs/task/CollectOrdersScheduler.java b/src/main/java/com/zy/asrs/task/CollectOrdersScheduler.java
new file mode 100644
index 0000000..cd2aa4e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/CollectOrdersScheduler.java
@@ -0,0 +1,193 @@
+package com.zy.asrs.task;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.OrderResult;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.DocTypeServiceImpl;
+import com.zy.common.utils.HttpHandler;
+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;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.HashMap;
+
+@Service
+@Slf4j
+public class CollectOrdersScheduler extends AbstractHandler<String> {
+    @Value("${erp.address.URL}")
+    private String URL;
+    @Value("${erp.address.inaddress}")
+    private String inaddress;
+
+    @Autowired
+    private OrderService orderService;
+    @Autowired
+    private DocTypeService docTypeService;
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
+    @Autowired
+    private MatService matService;
+    @Autowired
+    private OrderDetlService orderDetlService;
+    @Autowired
+    private ApiLogService apiLogService;
+
+    /**
+     * 杞鑾峰彇鍏ュ簱璁㈠崟
+     */
+    @Scheduled(cron = "0/10 * * * * ? ")
+    private void execute() {
+        // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
+        LocalDateTime now = LocalDateTime.now();
+
+        // 鍑忓幓涓�涓湀
+        LocalDateTime oneMonthAgo = now.minusMonths(1);
+
+        // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡锛圚H琛ㄧず24灏忔椂鍒讹級
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 鏍煎紡鍖栨棩鏈熸椂闂�
+        String formattedDateTime = oneMonthAgo.format(formatter);
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("orgNo", 0);//缁勭粐缂栧彿
+//        map.put("docNo",0);
+        map.put("startTime", formattedDateTime);//寮�濮嬫椂闂�
+
+        String format = now.format(formatter);
+        map.put("endTime", format);//缁撴潫鏃堕棿
+
+        //鏌ヨ璁㈠崟
+        String response = "";
+        boolean success = false;
+        try {
+            response = new HttpHandler.Builder()
+                    .setUri(URL)
+                    .setPath(inaddress)
+                    .setJson(JSON.toJSONString(map))
+                    .build()
+                    .doPost();
+            JSONObject jsonObject = JSON.parseObject(response);
+            if (jsonObject.getInteger("status") == 200) {
+                JSONArray response1 = JSON.parseArray(jsonObject.get("response").toString());
+                for (int j = 0; j < response1.size(); j++) {
+                    OrderResult orderResult = response1.getObject(0, OrderResult.class);
+                    Order order = orderService.selectByNo(orderResult.getDocNo());//鍗曟嵁缂栧彿
+                    if (Cools.isEmpty(order)) {
+                        Date now1 = new Date();
+                        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("memo",orderResult.getDocType()));//鍗曟嵁缂栧彿
+                        // 鍗曟嵁涓绘。
+                        order = new Order(
+                                String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
+                                orderResult.getDocNo(),    // 璁㈠崟缂栧彿
+                                DateUtils.convert(now1),    // 鍗曟嵁鏃ユ湡
+                                docType.getDocId(),    // 鍗曟嵁绫诲瀷
+                                null,    // 椤圭洰缂栧彿
+                                null,    //
+                                null,    // 璋冩嫧椤圭洰缂栧彿
+                                null,    // 鍒濆绁ㄦ嵁鍙�
+                                null,    // 绁ㄦ嵁鍙�
+                                null,    // 瀹㈡埛缂栧彿
+                                null,    // 瀹㈡埛
+                                null,    // 鑱旂郴鏂瑰紡
+                                null,    // 鎿嶄綔浜哄憳
+                                null,    // 鍚堣閲戦
+                                null,    // 浼樻儬鐜�
+                                null,    // 浼樻儬閲戦
+                                null,    // 閿�鍞垨閲囪喘璐圭敤鍚堣
+                                null,    // 瀹炰粯閲戦
+                                null,    // 浠樻绫诲瀷
+                                null,    // 涓氬姟鍛�
+                                null,    // 缁撶畻澶╂暟
+                                null,    // 閭垂鏀粯绫诲瀷
+                                null,    // 閭垂
+                                null,    // 浠樻鏃堕棿
+                                null,    // 鍙戣揣鏃堕棿
+                                null,    // 鐗╂祦鍚嶇О
+                                null,    // 鐗╂祦鍗曞彿
+                                1L,    // 璁㈠崟鐘舵��
+                                1,    // 鐘舵��
+                                9527L,    // 娣诲姞浜哄憳
+                                now1,    // 娣诲姞鏃堕棿
+                                9527L,    // 淇敼浜哄憳
+                                now1,    // 淇敼鏃堕棿
+                                null    // 澶囨敞
+                        );
+                    }
+                    //鐗╂枡缂栫爜
+                    Mat mat = matService.selectByMatnr(orderResult.getItemNo());
+                    if (Cools.isEmpty(mat)) {
+                        throw new CoolException(orderResult.getItemNo() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+                    }
+                    OrderDetl orderDetl1 = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+                            .eq("order_no", orderResult.getDocNo())
+                            .eq("matnr", orderResult.getItemNo())
+                            .eq("batch", orderResult.getDocLotNo()));//鎵瑰彿
+                    if (!Cools.isEmpty(orderDetl1)) {
+                        continue;
+                    }
+                    DocType docType = docTypeService.selectById(orderResult.getDocType());
+                    OrderDetl orderDetl = new OrderDetl();
+                    orderDetl.sync(mat);
+                    orderDetl.setBatch(orderResult.getDocLotNo());
+                    orderDetl.setAnfme(orderResult.getApplyQty());
+                    orderDetl.setOrderId(order.getId());
+                    orderDetl.setOrderNo(order.getOrderNo());
+                    orderDetl.setCreateBy(9527L);
+                    orderDetl.setCreateTime(new Date());
+                    orderDetl.setUpdateBy(9527L);
+                    orderDetl.setUpdateTime(new Date());
+                    orderDetl.setStatus(1);
+                    orderDetl.setQty(0.0D);
+
+                    //淇濆瓨erp浼犺繃鏉ョ殑瀛楁
+                    orderDetl.setManu((orderResult.getOrgNo()));//缁勭粐缂栫爜
+                    orderDetl.setModel(orderResult.getDocSeqNo());//椤规--琛屽彿
+                    orderDetl.setColor(orderResult.getDocWarehouseNo());//浠诲姟浠撳簱
+                    orderDetl.setBrand(orderResult.getDocCellNo());//浠诲姟鍌ㄤ綅
+                    orderDetl.setUnit(orderResult.getUnitNo());//鍗曚綅缂栧彿
+                    orderDetl.setSku(orderResult.getUnitName());//鍗曚綅鍚嶇О
+                    orderDetl.setItemNum(orderResult.getSupplierNo());//渚涘簲鍟嗙紪鐮�
+                    orderDetl.setOrigin(orderResult.getSupplierName());//渚涘簲鍟嗗悕绉�
+
+                    if (!orderDetlService.insert(orderDetl)) {
+                        throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�");
+                    }
+                }
+            } else {
+            }
+        } catch (Exception e) {
+            log.error("fail", e);
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "杞鏁版嵁",
+                        URL + inaddress,
+                        null,
+                        "127.0.0.1",
+                        map.toString(),
+                        response,
+                        success
+                );
+            } catch (Exception e) {
+                log.error("", e);
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/ERPReportScheduler.java b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
new file mode 100644
index 0000000..4ccfb10
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
@@ -0,0 +1,138 @@
+package com.zy.asrs.task;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.OrderResult;
+import com.zy.asrs.service.*;
+import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+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;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+@Slf4j
+public class ERPReportScheduler extends AbstractHandler<String> {
+
+    @Value("${erp.address.URL}")
+    private String URL;
+    @Value("${erp.address.outaddress}")
+    private String outAddress;
+    @Autowired
+    private OrderDetlService orderDetlService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private WrkMastService wrkMastService;
+    @Autowired
+    private ConfigService configService;
+    @Autowired
+    private WrkDetlService wrkDetlService;
+    @Autowired
+    private OrderService orderService;
+    @Autowired
+    private DocTypeService docTypeService;
+
+
+    /**
+     * 鍗曚釜浠诲姟涓婃姤erp
+     */
+    @Scheduled(cron = "0/10 * * * * ? ")
+    private void execute() {
+        //鏌ユ壘鎵�鏈変换鍔℃。浠诲姟鐘舵�佷负40ERP涓婃姤涓殑浠诲姟
+        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 40));
+
+        //鏄惁闇�瑕佷笂鎶RP
+        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "newErpReport"));
+        if(!Cools.isEmpty(config)&&config.getValue().equals("Y")&&!Cools.isEmpty(wrkMasts)){
+
+            for(WrkMast wrkMast:wrkMasts){
+                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+                if(wrkDetls!=null&&wrkDetls.size()>0){
+                    List<LinkedHashMap<String,Object>> datas=new ArrayList<>();
+                    for(WrkDetl wrkDetl:wrkDetls){
+                        OrderDetl orderDetl= orderDetlService.selectItem(wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
+                        if(orderDetl==null){
+                            log.error("orderNo={}锛宮atnr={}锛宐atch={}锛屾病鏈夋煡璇㈠埌璁㈠崟鏄庣粏",wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
+                            continue;
+                        }
+                        Order order= orderService.selectByNo(wrkDetl.getOrderNo());
+                        if(order==null){
+                            log.error("orderNo={}锛宮atnr={}锛宐atch={}锛屾病鏈夋煡璇㈠埌璁㈠崟",wrkDetl.getOrderNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
+                            continue;
+                        }
+                        DocType docType = docTypeService.selectById(order.getDocType());//鍗曟嵁缂栧彿
+                        LinkedHashMap<String,Object> map=new LinkedHashMap<>();
+                        map.put("orgNo",orderDetl.getManu());//缁勭粐缂栫爜
+                        map.put("docNo",orderDetl.getOrderNo());
+                        map.put("docType",docType.getMemo());
+                        map.put("docSeqNo",orderDetl.getModel());
+                        map.put("itemNo",orderDetl.getMatnr());
+                        map.put("qty",wrkDetl.getAnfme());
+                        map.put("unitNo",orderDetl.getUnit());
+                        map.put("warehouseNo",orderDetl.getColor());
+                        map.put("cellNo",orderDetl.getBrand());
+                        map.put("combinationLotNo",String.valueOf(orderDetl.getBatch()));
+                        map.put("barcode",wrkDetl.getZpallet());
+                        datas.add(map);
+                    }
+
+                    HashMap<String,Object> map=new HashMap<>();
+                    map.put("data",datas);
+                    //涓婃姤ERP
+                    String response = "";
+                    boolean success = false;
+                    try {
+                        response = new HttpHandler.Builder()
+                                .setUri(URL)
+                                .setPath(outAddress)
+                                .setJson(JSON.toJSONString(map))
+                                .build()
+                                .doPost();
+                        JSONObject jsonObject = JSON.parseObject(response);
+                        if (jsonObject.getInteger("status") == 200) {
+                            if(wrkMast.getIoType()<100){
+                                wrkMast.setWrkSts(10L);//鍏ュ簱杞巻鍙叉。
+                            }else{
+                                wrkMast.setWrkSts(18L);//鍑哄簱杞巻鍙叉。
+                            }
+                        } else {
+                            log.error("浠诲姟鍙�={}锛屼笂鎶ュけ璐�",wrkMast.getWrkNo());
+                        }
+                    } catch (Exception e) {
+                        log.error("fail", e);
+                    } finally {
+                        try {
+                            // 淇濆瓨鎺ュ彛鏃ュ織
+                            apiLogService.save(
+                                    "涓婃姤浠诲姟缁撴灉缁橢RP",
+                                    URL + outAddress,
+                                    null,
+                                    "127.0.0.1",
+                                    map.toString(),
+                                    response,
+                                    success
+                            );
+                        } catch (Exception e) {
+                            log.error("", e);
+                        }
+                    }
+                }else {
+                    log.error("浠诲姟鍙凤細{}锛屾病鏈変换鍔℃槑缁�",wrkMast.getWrkNo());
+                }
+            }
+        }
+
+    }
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 7977444..ea77a6a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -9,6 +9,8 @@
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +38,8 @@
     private LocDetlService locDetlService;
     @Autowired
     private WaitPakinService waitPakinService;
+    @Autowired
+    private ConfigService configService;
 
     public ReturnT<String> start(WrkMast wrkMast) {
         // 9.鍏ュ簱瀹屾垚
@@ -51,6 +55,9 @@
     private ReturnT<String> doIn(WrkMast wrkMast){
         Date now = new Date();
         LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+
+        //鍒ゆ柇浠诲姟鏄惁鏈夎鍗曞彿
+        Boolean boo=false;
         try {
             if (null == locMast) {
                 exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -84,8 +91,13 @@
                     if (wrkDetls.isEmpty()) {
                         exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗d笉瀛樺湪锛沎workNo={0}]", wrkMast.getWrkNo());
                     }
+                    //鍒ゆ柇鏄惁鏈夎鍗曞彿
+                    if(!Cools.isEmpty(wrkDetls.get(0).getOrderNo())){
+                        boo=true;
+                    }
                     // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
                     for (WrkDetl wrkDetl : wrkDetls) {
+
                         wrkDetl.setBatch("");
                         LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                         if (null != locDetl) {
@@ -143,6 +155,12 @@
                     if (wrkDetls53.isEmpty()) {
                         exceptionHandle("鎷f枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗d负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
                     }
+
+                    //鍒ゆ柇鏄惁鏈夎鍗曞彿
+                    if(!Cools.isEmpty(wrkDetls53.get(0).getOrderNo())){
+                        boo=true;
+                    }
+
                     for (WrkDetl wrkDetl : wrkDetls53) {
 
                         LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
@@ -273,8 +291,15 @@
                 default:
                     break;
             }
-            // 淇敼宸ヤ綔涓绘。鐘舵��
-            wrkMast.setWrkSts(10L);
+
+            //鏄惁闇�瑕佷笂鎶RP
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "newErpReport"));
+            if(!Cools.isEmpty(config)&&config.getValue().equals("Y")&&boo){
+                wrkMast.setWrkSts(40L);//浠诲姟鐘舵�佽浆ERP涓婃姤涓�
+            }else{
+                // 淇敼宸ヤ綔涓绘。鐘舵��
+                wrkMast.setWrkSts(10L);
+            }
             wrkMast.setModiTime(now);
             if (!wrkMastService.updateById(wrkMast)) {
                 exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
@@ -289,8 +314,12 @@
     }
 
     private ReturnT<String> doOut(WrkMast wrkMast){
+
         Date now = new Date();
         LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+
+        //鍒ゆ柇浠诲姟鏄惁鏈夎鍗曞彿
+        Boolean boo=false;
         try {
             if (null == locMast) {
                 exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -338,6 +367,11 @@
                     if (wrkDetls101.isEmpty()) {
                         exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗d负绌猴紱[workNo={0}]", wrkMast.getWrkNo());
                     }
+                    //鍒ゆ柇鏄惁鏈夎鍗曞彿
+                    if(!Cools.isEmpty(wrkDetls101.get(0).getOrderNo())){
+                        boo=true;
+                    }
+
                     for (WrkDetl wrkDetl : wrkDetls101) {
                         // todo:luxiaotao 3)淇敼鍑哄簱閫氱煡妗� status ==> Y
                     }
@@ -375,8 +409,14 @@
                     break;
             }
             if(wrkMast.getIoType()!=11) {
-                // 淇敼宸ヤ綔涓绘。鐘舵��
-                wrkMast.setWrkSts(18L);
+                //鏄惁闇�瑕佷笂鎶RP
+                Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "newErpReport"));
+                if(!Cools.isEmpty(config)&&config.getValue().equals("Y")&&boo){
+                    wrkMast.setWrkSts(40L);//浠诲姟鐘舵�佽浆ERP涓婃姤涓�
+                }else{
+                    // 淇敼宸ヤ綔涓绘。鐘舵��
+                    wrkMast.setWrkSts(18L);
+                }
                 wrkMast.setModiTime(now);
                 if (!wrkMastService.updateById(wrkMast)) {
                     exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eb37d1f..a7f92bb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -59,3 +59,13 @@
 store:
   bufferCount: 2
 
+#erp瀵规帴
+erp:
+  #鍦板潃
+  address:
+    URL: http://192.168.3.102:16001
+    #鍏ュ簱鍗曟嵁
+    inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
+    #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
+    outaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
+

--
Gitblit v1.9.1