From c643491fffa78a9210abfa7cbdd9e0851648a3d7 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 15 十二月 2025 13:40:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 9 +++
src/main/java/com/zy/common/model/YXErpPakinParam.java | 114 ++++++++++++++++++++++++++++----------
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 4
src/main/java/com/zy/common/constant/MesConstant.java | 5 +
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 8 +-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 21 +++---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 16 ++--
7 files changed, 122 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index a6dfdc7..f2460f5 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -440,6 +440,15 @@
}
}
+ public String getMatnr$() {
+ if (null == this.matnr){ return null; }
+ switch (this.matnr){
+ case "JL0001":
+ return "XJ0001";
+ }
+ return matnr;
+ }
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 61004e9..d338db9 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -38,11 +38,11 @@
}
}
-// @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+// String erpReport = Parameter.get().getErpReport();
+// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
ReturnT<String> result = orderSyncHandler.start(order);
@@ -50,7 +50,7 @@
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
}
- }
+// }
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index 76ec280..fef9329 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -41,7 +41,7 @@
for (OrderDetl orderDetl : orderDetls) {
orderDetl.setUpdateBy(0L);
orderDetl.setUpdateTime(now);
- orderDetlService.addToLogTable(orderDetl);
+// orderDetlService.addToLogTable(orderDetl);
orderDetlService.delete(new EntityWrapper<OrderDetl>()
.eq("id",orderDetl.getId()));
}
@@ -49,7 +49,7 @@
if (!Cools.isEmpty(order)){
order.setUpdateBy(0L);
order.setUpdateTime(now);
- orderService.addToLogTable(order);
+// orderService.addToLogTable(order);
orderService.delete(new EntityWrapper<Order>()
.eq("id",order.getId()));
}
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 cba3103..173e340 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -55,34 +55,31 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
- YXErpPakinParam pakinParam = new YXErpPakinParam();
- String convert = DateUtils.convert(new Date(), DateUtils.yyyyMMdd);
- pakinParam.setCTVCode(order.getOrderNo());
- pakinParam.setDTVDate(convert);
- pakinParam.setDVerifyDate(convert);
+ YXErpPakinParam pakinParam = new YXErpPakinParam(order.getOrderNo(),order.getMemo());
for (OrderDetl orderDetl : orderDetls) {
// String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getDetail().add(new YXErpPakinParam.Detl(order.getOrderNo(),orderDetl.getMatnr(), orderDetl.getAnfme()));
+ pakinParam.getDetail().add(new YXErpPakinParam.Detl(orderDetl,true));
+ pakinParam.getDetail().add(new YXErpPakinParam.Detl(orderDetl,false));
}
String response = "";
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setUri(MesConstant.ERP_URL)
+ .setPath(MesConstant.ERP_BIG_URL)
.setJson(JSON.toJSONString(pakinParam))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (jsonObject.getInteger("code").equals(0)) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("涓婃姤瀹屾垚鏇存柊璁㈠崟鐘舵�佸紓甯革紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.ERP_URL+MesConstant.ERP_BIG_URL, JSON.toJSONString(pakinParam), response);
order.setUpdateTime(new Date());
orderService.updateById(order);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -98,7 +95,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鑳舵枡鍏ュ簱涓婃姤鑷矱RP",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ MesConstant.ERP_URL + MesConstant.ERP_BIG_URL,
null,
"127.0.0.1",
JSON.toJSONString(pakinParam),
@@ -108,6 +105,7 @@
} catch (Exception e) { log.error("", e); }
}
}
+ /*
// 鍑哄簱瀹屾垚涓婃姤
if (docType.getPakout() == 1) {
MesPakoutParam pakoutParam = new MesPakoutParam();
@@ -162,6 +160,7 @@
} catch (Exception e) { log.error("", e); }
}
}
+ */
return SUCCESS;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index b090804..73dfd81 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -83,14 +83,14 @@
log.error("鍒犻櫎鍏ュ簱閫氱煡妗workNo={"+wrkMast.getWrkNo()+"}]澶辫触");
}
}
-// if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
-// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
-// if (!Cools.isEmpty(wrkDetls)) {
-// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
-// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-// }
-// }
+ if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
+ // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
+ if (!Cools.isEmpty(wrkDetls)) {
+ if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
+ exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
+ }
// 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
// if (!Cools.isEmpty(wrkDetls)) {
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index eb34e04..8bec0fb 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -7,6 +7,11 @@
public static final String URL = "http://192.168.99.130:80";
+ public static final String ERP_URL = "http://192.168.20.3:99";
+
+ public static final String ERP_BIG_URL = "api/v1/AssemVouch_add?db=001&zt=001";
+
+
public static final String PACK_DOWN_URL = "mes/api/zy/v1/packDown/sendList";
public static final String PAKIN_URL = "mes/api/zy/v1/warehouse/sendList";
diff --git a/src/main/java/com/zy/common/model/YXErpPakinParam.java b/src/main/java/com/zy/common/model/YXErpPakinParam.java
index 7b5b8e4..ab00b86 100644
--- a/src/main/java/com/zy/common/model/YXErpPakinParam.java
+++ b/src/main/java/com/zy/common/model/YXErpPakinParam.java
@@ -1,7 +1,10 @@
package com.zy.common.model;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.OrderDetl;
import lombok.Data;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -11,55 +14,106 @@
*/
@Data
public class YXErpPakinParam {
-
- // 搴撳瓨璋冩嫧鍗曞彿
- private String cTVCode; //蹇呭～
// 鍗曟嵁鏃ユ湡
+ private String dAVDate; //蹇呭～
private String dTVDate; //蹇呭～
- // 杞嚭浠撳簱缂栫爜
- private String cOWhCode = "100";
+ private String dVerifyDate;
+ private String cODepCode = "01"; //蹇呭～
+ private String cIRdCode = "107"; //蹇呭～
+ private String cORdCode = "207"; //蹇呭～
// 杞叆浠撳簱缂栫爜
- private String cIWhCode = "201";
- // 杞嚭閮ㄩ棬缂栫爜
- private String cODepCode;
- // 杞叆閮ㄩ棬缂栫爜
- private String cIDepCode;
- // 鍏ュ簱绫诲埆缂栫爜
- private String cIRdCode = "105";
- // 鍑哄簱绫诲埆缂栫爜
- private String cORdCode = "205";
- // 鍒跺崟浜�
private String cMaker = "WMS绠＄悊鍛�";
- // 瀹℃牳浜�
+ // 杞嚭閮ㄩ棬缂栫爜
private String cVerifyPerson = "WMS绠＄悊鍛�";
- // 瀹℃牳鏃ユ湡
- private String dVerifyDate; //蹇呭～
+ // 杞嚭浠撳簱缂栫爜
+ private String cAVMemo = "澶囨敞";
+ private String cAVCode;
private List<Detl> detail = new ArrayList<>();
+
+ public YXErpPakinParam() {
+ this.dTVDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.dAVDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.dVerifyDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ }
+
+ public YXErpPakinParam(String cAVCod, String cAVMemo) {
+ this.dTVDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.dAVDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.dVerifyDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.cAVCode = cAVCod;
+ this.cAVMemo = cAVMemo;
+ }
+
+ public YXErpPakinParam(String dTVDate, String cAVMemo, String cAVCod, List<Detl> detail) {
+ this.dTVDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.dAVDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.dVerifyDate = DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F);
+ this.dTVDate = dTVDate;
+ this.cAVMemo = cAVMemo;
+ this.cAVCode = cAVCod;
+ this.detail = detail;
+ }
+
+ public YXErpPakinParam(String cODepCode, String cIRdCode, String cORdCode, String cAVMemo, String cMaker, String cVerifyPerson, List<Detl> detail) {
+ this.dTVDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ this.dAVDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ this.dVerifyDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ this.cODepCode = cODepCode;
+ this.cIRdCode = cIRdCode;
+ this.cORdCode = cORdCode;
+ this.cAVMemo = cAVMemo;
+ this.cMaker = cMaker;
+ this.cVerifyPerson = cVerifyPerson;
+ this.detail = detail;
+ }
@Data
public static class Detl {
// 搴撳瓨璋冩嫧鍗曞彿
- private String cTVCode; //蹇呭～
+ private String cbMemo; //蹇呭～
// 鐗╂枡缂栫爜 瀛樿揣缂栫爜
+ private String cAVCode; //蹇呭～
+ private String cWhCode; //蹇呭～
private String cInvCode; //蹇呭～
-
- // 鐗╂枡鏉＄爜
-// private String barcode;
-
- // 鏁伴噺
-// private Double anfme;
- private Double iTVQuantity; //蹇呭～
+ private double iAVQuantity; //蹇呭～
+ private String cAVBatch; //蹇呭～
+ private String bAVType; //蹇呭～
+ private Integer iGroupNO; //蹇呭～
public Detl() {
}
- public Detl(String cTVCode, String cInvCode, Double iTVQuantity) {
- this.cTVCode = cTVCode;
- this.cInvCode = cInvCode;
- this.iTVQuantity = iTVQuantity;
+ public Detl(OrderDetl orderDetl,boolean bool) {
+ if (bool){
+ Detl1(orderDetl);
+ } else {
+ Detl2(orderDetl);
+ }
+
+ }
+ public void Detl1(OrderDetl orderDetl) {
+ this.cbMemo = orderDetl.getMemo();
+ this.cAVCode = orderDetl.getOrderNo();
+ this.cWhCode = "100";
+ this.cInvCode = orderDetl.getMatnr$();
+ this.iAVQuantity = orderDetl.getWeight();
+ this.cAVBatch = orderDetl.getBatch();
+ this.bAVType = "杞崲鍓�";
+ this.iGroupNO = 1;
+ }
+
+ public void Detl2(OrderDetl orderDetl) {
+ this.cbMemo = orderDetl.getMemo();
+ this.cAVCode = orderDetl.getOrderNo();
+ this.cWhCode = "201";
+ this.cInvCode = orderDetl.getMatnr();
+ this.iAVQuantity = orderDetl.getWeight();
+ this.cAVBatch = orderDetl.getBatch();
+ this.bAVType = "杞崲鍚�";
+ this.iGroupNO = 1;
}
}
--
Gitblit v1.9.1