From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/task/ERPReportScheduler.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ERPReportScheduler.java b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
index 4ccfb10..7005ede 100644
--- a/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ERPReportScheduler.java
@@ -27,8 +27,10 @@
@Value("${erp.address.URL}")
private String URL;
- @Value("${erp.address.outaddress}")
- private String outAddress;
+ @Value("${erp.address.outReportAddress}")
+ private String outReportAddress;
+ @Value("${erp.address.inReportAddress}")
+ private String inReportAddress;
@Autowired
private OrderDetlService orderDetlService;
@Autowired
@@ -49,7 +51,7 @@
* 鍗曚釜浠诲姟涓婃姤erp
*/
@Scheduled(cron = "0/10 * * * * ? ")
- private void execute() {
+ private synchronized void execute() {
//鏌ユ壘鎵�鏈変换鍔℃。浠诲姟鐘舵�佷负40ERP涓婃姤涓殑浠诲姟
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 40));
@@ -81,13 +83,22 @@
map.put("itemNo",orderDetl.getMatnr());
map.put("qty",wrkDetl.getAnfme());
map.put("unitNo",orderDetl.getUnit());
- map.put("warehouseNo",orderDetl.getColor());
+ map.put("warehouseNo","02201");
map.put("cellNo",orderDetl.getBrand());
map.put("combinationLotNo",String.valueOf(orderDetl.getBatch()));
- map.put("barcode",wrkDetl.getZpallet());
+ map.put("barcode",wrkDetl.getMatnr());
datas.add(map);
}
-
+ String path= "";
+ String work= "";
+ if(wrkMast.getIoType()<100){
+ path=inReportAddress;
+ work="鍏ュ簱";
+ }else{
+ path=outReportAddress;
+ work="鍑哄簱";
+ }
+ path=outReportAddress;
HashMap<String,Object> map=new HashMap<>();
map.put("data",datas);
//涓婃姤ERP
@@ -96,7 +107,7 @@
try {
response = new HttpHandler.Builder()
.setUri(URL)
- .setPath(outAddress)
+ .setPath(path)
.setJson(JSON.toJSONString(map))
.build()
.doPost();
@@ -107,6 +118,7 @@
}else{
wrkMast.setWrkSts(18L);//鍑哄簱杞巻鍙叉。
}
+ wrkMastService.updateById(wrkMast);
} else {
log.error("浠诲姟鍙�={}锛屼笂鎶ュけ璐�",wrkMast.getWrkNo());
}
@@ -116,8 +128,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "涓婃姤浠诲姟缁撴灉缁橢RP",
- URL + outAddress,
+ "涓婃姤"+work+"浠诲姟缁撴灉缁橢RP",
+ URL + path,
null,
"127.0.0.1",
map.toString(),
--
Gitblit v1.9.1