From 541343ce5f5a3c438875f26418957360f779c004 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期五, 27 六月 2025 15:03:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
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/controller/OpenController.java | 164 +++++---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 4
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 210 +++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 152 ++++++++
src/main/java/com/zy/asrs/task/CollectOrdersScheduler.java | 193 ++++++++++
src/main/java/com/zy/asrs/task/ERPReportScheduler.java | 138 +++++++
src/main/java/com/zy/common/service/CommonService.java | 8
src/main/java/com/zy/asrs/service/OpenService.java | 10
src/main/resources/application.yml | 10
12 files changed, 954 insertions(+), 115 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ea51689..9b837e3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,11 +4,10 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -35,6 +34,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private WrkMastService wrkMastService;
@@ -58,29 +59,7 @@
- /**
- * 娣诲姞鍏ュ簱鍗�
- */
- @PostMapping("/order/pakin/new/default/v1")
- public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakinOrderCreate(param);
- return R.ok();
- }
+
/**
* 鍏ュ簱鍗曞洖鍐�
@@ -93,36 +72,7 @@
return R.ok().add(openService.pakinOrderComplete(param));
}
- /**
- * 娣诲姞鍑哄簱鍗�
- */
- @PostMapping("/order/pakout/new/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- //if (Cools.isEmpty(param.getLgort())) {
- // return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
- //}
- //if (!param.getLgort().equals("5006")) {
- // return R.ok();
- //}
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakoutOrderCreate(param);
- return R.ok();
- }
+
/**
* 鍑哄簱鍗曞洖鍐�
@@ -161,6 +111,106 @@
}
}
+
+
+
+
+ @PostMapping("/order/matSync/default/v2")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam.MatParam param,
+ HttpServletRequest request){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ objects.add(param);
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
+ return R.ok();
+ }
+
+ /**
+ * 娣诲姞鍏ュ簱鍗�
+ */
+ @PostMapping("/order/pakin/new/default/v1")
+ public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.pakinOrderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/new/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.pakoutOrderCreate(param);
+ return R.ok();
+ }
+
+
+ /**
+ * 鎹℃枡杞叏鏉�
+ */
+ @PostMapping("/pickToFill/barcode")
+ @AppAuth(memo = "鎹℃枡杞叏鏉�")
+ public synchronized R againOut(@RequestHeader(required = false) String appkey,
+ @RequestBody PackParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)||Cools.isEmpty(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷负绌�,璇锋鏌�");
+ }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMast)) {
+ return R.error("鏃犳硶閫氳繃鎵樼洏鐮佹壘鍒拌宸ヤ綔妗�,璇锋鏌ユ墭鐩樼爜鏄惁姝ｇ‘");
+ }
+ if (wrkMast.getIoType() != 103) {
+ return R.error("浠呮湁鎹℃枡鍑哄簱鍙互浣跨敤璇ュ姛鑳�");
+ }
+ if (wrkMast.getWrkSts() != 17) {
+ return R.error("鎹℃枡鍑哄簱鏈畬鎴�,璇风瓑寰呰澶囪繍琛屽畬鎴�");
+ }
+ openService.pickToFill(wrkMast);
+ return R.ok();
+ }
+
+
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
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/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
new file mode 100644
index 0000000..c7f28c5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -0,0 +1,210 @@
+package com.zy.asrs.entity.param;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍟嗗搧鍚屾鎺ュ彛锛屽弬鏁�
+ * Created on 2022/6/22
+ */
+@Data
+public class MatSyncParam {
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ public String createTime;
+
+ public List<MatParam> matDetails;
+
+ @Data
+ public static class MatParam{
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ private String maktx;
+
+ /**
+ * 鍟嗗搧鍒嗙被
+ */
+ private String groupCode;
+
+ /**
+ * 鍒嗙被鍚嶇О
+ */
+ private String groupName;
+
+ /**
+ * 鍒悕
+ */
+ private String name;
+
+ /**
+ * 瑙勬牸
+ */
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ private Double price;
+
+ /**
+ * sku
+ */
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ private Integer deadWarn;
+
+ /**
+ * 鏉ユ簮 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ private Integer status;
+ /**
+ * 楂橀鍏ュ嚭搴撶墿鏂�
+ */
+ private Boolean inoutEveryday;
+
+ /**
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ */
+ private Integer matType;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ private String createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 澶囨敞
+ */
+ private String memo;
+ }
+
+}
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/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index c349203..0cc0b40 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,9 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -41,4 +39,8 @@
// 鎵撳寘涓婄嚎
void packageUp(PackParam param);
+ void pickToFill(WrkMast wrkMast);
+
+
+ void syncMat(MatSyncParam param);
}
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 d593df9..7baeb5f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.TagMapper;
@@ -17,6 +15,7 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
+import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -51,6 +50,14 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private LocMastService locMastService;
@Override
@Transactional
@@ -273,6 +280,34 @@
}
@Override
+ @Transactional
+ public void pickToFill(WrkMast wrkMast) {
+ Date now = new Date();
+ wrkMast.setIoType(101);
+ wrkMast.setMemo("鎹℃枡杞叏鏉垮伐浣滄。");
+ wrkMastService.update(wrkMast, new EntityWrapper<WrkMast>()
+ .eq("wrk_no", wrkMast.getWrkNo()));
+ wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+ for (LocDetl locDetl : locDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setZpallet(wrkDetl.getBarcode());
+ wrkDetl.setBarcode(wrkMast.getBarcode());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setAppeUser(1L);
+ wrkDetl.setModiUser(1L);
+ wrkDetl.setMatType(locDetl.getMatType());
+ wrkDetlService.insert(wrkDetl);
+ }
+ locMastService.updateLocSts(wrkMast.getSourceLocNo(), "R");
+ }
+
+
+ @Override
public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
@@ -438,4 +473,113 @@
}
}
+ @Override
+ @Transactional
+ public void syncMat(MatSyncParam param) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
+ throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
+ }
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
+ throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(matParam.getInoutEveryday())) {
+ throw new CoolException("鏄惁涓洪珮棰戝叆鍑哄簱鐗╂枡鏍囪瘑涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(matParam.getMatType())) {
+ throw new CoolException("涓婃灦鍖哄煙涓嶈兘涓虹┖");
+ }
+ Date now = new Date();
+ Mat mat = matService.selectByMatnr(matParam.getMatnr());
+ if (mat == null) {
+ mat = new Mat();
+ // 鍒嗙被
+ Long tagId;
+ // 涓�绾у垎绫�
+ if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+ Tag priTag = tagService.selectOne(new EntityWrapper<Tag>().eq("name", matParam.getGroupCode()));
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupCode(), // 鍚嶇О
+ top.getId(), // 鐖剁骇
+ top.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(priTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ // 浜岀骇鍒嗙被
+ Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+ if (secTag == null) {
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ secTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupName(), // 鍚嶇О
+ priTag.getId(), // 鐖剁骇
+ priTag.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 3, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ tagId = secTag.getId();
+ } else {
+ tagId = tagService.getTop().getId();
+ }
+ Synchro.Copy(matParam,mat);
+
+
+ mat.setTagId(tagId);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+ }
+ } else {
+ Synchro.Copy(matParam,mat);
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
+ throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+
+ }
}
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/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 43b50b1..3a333e7 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -89,7 +89,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
+ "鍏ュ簱涓婃姤",
MesConstant.URL + MesConstant.PAKIN_URL,
null,
"127.0.0.1",
@@ -143,7 +143,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳嚭搴撲笂鎶�",
+ "鍑哄簱涓婃姤",
MesConstant.URL + MesConstant.PAKOUT_URL,
null,
"127.0.0.1",
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("鍏ㄦ澘鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ笉瀛樺湪锛沎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("鎷ｆ枡鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[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("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌猴紱[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/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 39dc42f..6b0a0a8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -201,10 +201,10 @@
}
}
- if (matNos.size() > 1 && matType == 1) {
- //鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱
- throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�");
- }
+// if (matNos.size() > 1 && matType == 1) {
+// //鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱
+// throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�");
+// }
}
if (!sign && matType != null) {
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