From 5127f46eedeede5cbfeae7a4908ddac11d332494 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 11 六月 2025 17:20:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 306 ++++++++++++++++++++++++++-------------------------
1 files changed, 156 insertions(+), 150 deletions(-)
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 71081eb..ad589df 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -62,7 +62,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String formattedDate = sdf.format(wrkMast.getModiTime());
Config config=configService.selectConfigByCode("reportMes");
- if(config==null||!config.getValue().equals("Y")){
+ if(config==null||!config.getValue().equals("Y")||wrkMast.getIoType()==110||wrkMast.getIoType()==10||wrkMast.getIoType()==11){
if(wrkMast.getIoType() == 1){
// 鍏ㄦ澘鍏ュ簱
// 鍏ュ簱閫氱煡鍗�
@@ -85,170 +85,176 @@
if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ if(wrkMast.getIoType()==110||wrkMast.getIoType()==10){
+
+ }else{
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+ }
+ // 鍒犻櫎宸ヤ綔鏄庣粏妗�
+ if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
}
- }
- try {
- LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
- String GnBm ="";
- String Biaomc="";
-
- List<LinkedHashMap<String,Object>> Baocuncanshus = new ArrayList<LinkedHashMap<String,Object>>();
- LinkedHashMap<String,Object> Baocuncanshu=new LinkedHashMap<String,Object>();
-
-
- // 鍏ュ簱 --------------------------------------------------------------------------------
- if (wrkMast.getIoType() == 1) {
- GnBm = "bopp_ck1070d0e";
- Biaomc = "bopp_j000000";
- Baocuncanshu.put("bh","");
- Baocuncanshu.put("djlb","鍗婃垚鍝佸叆搴�");
- Baocuncanshu.put("rq",formattedDate);
- Baocuncanshu.put("startStorageId","");//璧峰浣嶇疆
- Baocuncanshu.put("endStorageId","");//鐩爣浣嶇疆
- Baocuncanshu.put("tm_dp_wms",wrkMast.getBarcode());//鎵樼洏鐮�
- Baocuncanshu.put("shbz","绔嬪簱");//浣嶇疆绫诲埆
- Baocuncanshu.put("bz","");//澶囨敞
- Baocuncanshu.put("ck","绔嬪簱");//浠撳簱
- Baocuncanshus.add(Baocuncanshu);
- // 鍑哄簱 --------------------------------------------------------------------------------
- } else if (wrkMast.getIoType() == 101) {
- GnBm = "bopp_ck1090d0e";
- Biaomc = "bopp_j000000";
- Baocuncanshu.put("bh","");
- Baocuncanshu.put("djlb","鏅�氳皟鎷�");
- Baocuncanshu.put("rq",formattedDate);
- Baocuncanshu.put("yck","甯冨熀鍗婃垚鍝佷粨");
- Baocuncanshu.put("xck","澶嶅嵎1#鏈鸿捣鐐�");
- Baocuncanshu.put("bh_bopp_e050000","");
- Baocuncanshu.put("ykw","搴撲綅2");
- Baocuncanshu.put("bz","");//澶囨敞
- Baocuncanshu.put("xkw","FJ-01-01-01");
- Baocuncanshus.add(Baocuncanshu);
- }
-
- LinkedHashMap<String,Object> YongHuCanShu= new LinkedHashMap<String,Object>();
- YongHuCanShu.put("QianMingId","");
- map.put("YongHuCanShu",YongHuCanShu);
-
- LinkedHashMap<String,Object> QiTaCanShu= new LinkedHashMap<String,Object>();
- QiTaCanShu.put("GnBm",GnBm);
- QiTaCanShu.put("Operation", "1");
- QiTaCanShu.put("zid", "");
- QiTaCanShu.put("shbz", "");
- QiTaCanShu.put("shjg", "");
-
- List<LinkedHashMap<String,Object>> Caozuojihes = new ArrayList<LinkedHashMap<String,Object>>();
- LinkedHashMap<String,Object>Caozuojihe =new LinkedHashMap<String,Object>();
- Caozuojihe.put("Xh1","1");
- Caozuojihe.put("Xh2","1");
- Caozuojihe.put("Biaomc",Biaomc);
-
-
- Caozuojihe.put("Baocuncanshu",Baocuncanshus);
- Caozuojihes.add(Caozuojihe);
-
- LinkedHashMap<String,Object> Caozuojihe1=new LinkedHashMap<String,Object>();
- Caozuojihe1.put("Xh1","1");
- Caozuojihe1.put("Xh2","4");
- Caozuojihe1.put("Biaomc","bopp_j000101");
-
- List<LinkedHashMap<String,Object>> Baocuncanshus1 = new ArrayList<LinkedHashMap<String,Object>>();
- LinkedHashMap<String,Object> Baocuncanshu1=new LinkedHashMap<String,Object>();
- Baocuncanshu1.put("tm_xj",wrkDetl.get(0).getBatch());//鍞竴鐮�
- Baocuncanshus1.add(Baocuncanshu1);
- Caozuojihe1.put("Baocuncanshu",Baocuncanshus1);
-
- Caozuojihes.add(Caozuojihe1);
-
- QiTaCanShu.put("Caozuojihe", Caozuojihes);
-
- map.put("QiTaCanShu",QiTaCanShu);
-
- HashMap<String,Object>hashMap=new HashMap<String,Object>();
- hashMap.put("Quanjucanshu","%7B%22XiTongCanShu%22%3A%7B%22xt_id%22%3A%2230077%22%2C%22xt_bm%22%3A%22undefined%22%2C%22xt_yhid%22%3A%22156%22%2C%22xt_yhms%22%3A%22%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yhbm%22%3A%22admin%22%2C%22xt_qyms%22%3A%221%22%2C%22xt_qyjc%22%3A%221%22%2C%22xt_jsms%22%3A%22%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yuyan%22%3A%22%22%7D%2C%22NeiBuCanShu%22%3A%7B%7D%7D");
-
- String jsonString = JSON.toJSONString(map);
- HashMap<String,Object>hashMap1=new HashMap<String,Object>();
- hashMap1.put("CanShuJi",jsonString);
- String response = "";
- boolean success = false;
+ }else{
try {
- response = new HttpHandler.Builder()
- .setHeaders(hashMap)
- .setUri(url)
- .setPath(outaddressSave)
- .setParams(hashMap1)
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getString("BianHao").equals("0000")) {
- success=true;
- if(wrkMast.getIoType() == 1){
- // 鍏ㄦ澘鍏ュ簱
- // 鍏ュ簱閫氱煡鍗�
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
- if (!waitPakinLogService.save(wrkMast.getBarcode())) {
- exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎鍏ュ簱閫氱煡妗�
- if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
- exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
+ String GnBm ="";
+ String Biaomc="";
+
+ List<LinkedHashMap<String,Object>> Baocuncanshus = new ArrayList<LinkedHashMap<String,Object>>();
+ LinkedHashMap<String,Object> Baocuncanshu=new LinkedHashMap<String,Object>();
+
+
+ // 鍏ュ簱 --------------------------------------------------------------------------------
+ if (wrkMast.getIoType() == 1) {
+ GnBm = "bopp_ck1070d0e";
+ Biaomc = "bopp_j000000";
+ Baocuncanshu.put("bh","");
+ Baocuncanshu.put("djlb","鍗婃垚鍝佸叆搴�");
+ Baocuncanshu.put("rq",formattedDate);
+ Baocuncanshu.put("startStorageId","");//璧峰浣嶇疆
+ Baocuncanshu.put("endStorageId","");//鐩爣浣嶇疆
+ Baocuncanshu.put("tm_dp_wms",wrkMast.getBarcode());//鎵樼洏鐮�
+ Baocuncanshu.put("shbz","绔嬪簱");//浣嶇疆绫诲埆
+ Baocuncanshu.put("bz","");//澶囨敞
+ Baocuncanshu.put("ck","绔嬪簱");//浠撳簱
+ Baocuncanshus.add(Baocuncanshu);
+ // 鍑哄簱 --------------------------------------------------------------------------------
+ } else if (wrkMast.getIoType() == 101) {
+ GnBm = "bopp_ck1090d0e";
+ Biaomc = "bopp_j000000";
+ Baocuncanshu.put("bh","");
+ Baocuncanshu.put("djlb","鏅�氳皟鎷�");
+ Baocuncanshu.put("rq",formattedDate);
+ Baocuncanshu.put("yck","甯冨熀鍗婃垚鍝佷粨");
+ Baocuncanshu.put("xck","澶嶅嵎1#鏈鸿捣鐐�");
+ Baocuncanshu.put("bh_bopp_e050000","");
+ Baocuncanshu.put("ykw","搴撲綅2");
+ Baocuncanshu.put("bz","");//澶囨敞
+ Baocuncanshu.put("xkw","FJ-01-01-01");
+ Baocuncanshus.add(Baocuncanshu);
+ }
+
+ LinkedHashMap<String,Object> YongHuCanShu= new LinkedHashMap<String,Object>();
+ YongHuCanShu.put("QianMingId","");
+ map.put("YongHuCanShu",YongHuCanShu);
+
+ LinkedHashMap<String,Object> QiTaCanShu= new LinkedHashMap<String,Object>();
+ QiTaCanShu.put("GnBm",GnBm);
+ QiTaCanShu.put("Operation", "1");
+ QiTaCanShu.put("zid", "");
+ QiTaCanShu.put("shbz", "");
+ QiTaCanShu.put("shjg", "");
+
+ List<LinkedHashMap<String,Object>> Caozuojihes = new ArrayList<LinkedHashMap<String,Object>>();
+ LinkedHashMap<String,Object>Caozuojihe =new LinkedHashMap<String,Object>();
+ Caozuojihe.put("Xh1","1");
+ Caozuojihe.put("Xh2","1");
+ Caozuojihe.put("Biaomc",Biaomc);
+
+
+ Caozuojihe.put("Baocuncanshu",Baocuncanshus);
+ Caozuojihes.add(Caozuojihe);
+
+ LinkedHashMap<String,Object> Caozuojihe1=new LinkedHashMap<String,Object>();
+ Caozuojihe1.put("Xh1","1");
+ Caozuojihe1.put("Xh2","4");
+ Caozuojihe1.put("Biaomc","bopp_j000101");
+
+ List<LinkedHashMap<String,Object>> Baocuncanshus1 = new ArrayList<LinkedHashMap<String,Object>>();
+ LinkedHashMap<String,Object> Baocuncanshu1=new LinkedHashMap<String,Object>();
+ Baocuncanshu1.put("tm_xj",wrkDetl.get(0).getBatch());//鍞竴鐮�
+ Baocuncanshus1.add(Baocuncanshu1);
+ Caozuojihe1.put("Baocuncanshu",Baocuncanshus1);
+
+ Caozuojihes.add(Caozuojihe1);
+
+ QiTaCanShu.put("Caozuojihe", Caozuojihes);
+
+ map.put("QiTaCanShu",QiTaCanShu);
+
+ HashMap<String,Object>hashMap=new HashMap<String,Object>();
+ hashMap.put("Quanjucanshu","%7B%22XiTongCanShu%22%3A%7B%22xt_id%22%3A%2230077%22%2C%22xt_bm%22%3A%22undefined%22%2C%22xt_yhid%22%3A%22156%22%2C%22xt_yhms%22%3A%22%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yhbm%22%3A%22admin%22%2C%22xt_qyms%22%3A%221%22%2C%22xt_qyjc%22%3A%221%22%2C%22xt_jsms%22%3A%22%E7%AE%A1%E7%90%86%E5%91%98%22%2C%22xt_yuyan%22%3A%22%22%7D%2C%22NeiBuCanShu%22%3A%7B%7D%7D");
+
+ String jsonString = JSON.toJSONString(map);
+ HashMap<String,Object>hashMap1=new HashMap<String,Object>();
+ hashMap1.put("CanShuJi",jsonString);
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(hashMap)
+ .setUri(url)
+ .setPath(outaddressSave)
+ .setParams(hashMap1)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getString("BianHao").equals("0000")) {
+ success=true;
+ if(wrkMast.getIoType() == 1){
+ // 鍏ㄦ澘鍏ュ簱
+ // 鍏ュ簱閫氱煡鍗�
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
}
}
- }
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
- exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!wrkMastService.deleteById(wrkMast)) {
+ exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+ }
+ // 鍒犻櫎宸ヤ綔鏄庣粏妗�
+ if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
+ }
- } else {
- log.error("wms涓婃姤缁撴灉缁檓es澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url+"/"+outaddressSave, JSON.toJSONString(map), response);
- throw new CoolException("wms涓婃姤缁撴灉缁檓es澶辫触");
+ } else {
+ log.error("wms涓婃姤缁撴灉缁檓es澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url+"/"+outaddressSave, JSON.toJSONString(map), response);
+ throw new CoolException("wms涓婃姤缁撴灉缁檓es澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "wms涓婃姤缁撴灉缁檓es",
+ url+"/"+outaddressSave,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(map),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
}
} catch (Exception e) {
log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "wms涓婃姤缁撴灉缁檓es",
- url+"/"+outaddressSave,
- null,
- "127.0.0.1",
- JSON.toJSONString(map),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
}
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
}
+
return SUCCESS;
}
--
Gitblit v1.9.1