From 80cd1569120416b096d28ebbe9a8e6e1d867f6e0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 19 九月 2024 14:19:45 +0800
Subject: [PATCH] 盘点异常处理
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 401 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 336 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b3a8d55..be1cef1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.mapper.MatMapper;
+import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.MesConstant;
@@ -92,6 +93,9 @@
@Resource
private OpenServiceImpl openServiceImpl;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
@Override
@Transactional
@@ -1203,7 +1207,7 @@
throw new CoolException("宸ヤ綔妗ｄ笉瀛樺湪锛�" + param.getBarcode());
}
if (wrkMast.getIoType() != 107 || wrkMast.getWrkSts() != 2) {
- throw new CoolException(wrkMast.getWrkNo() + ",宸ヤ綔妗ｇ被鍨嬶細" + wrkMast.getIoType() + "宸ヤ綔鐘舵�侊細" + wrkMast.getWrkSts() + ",涓嶅尮閰�");
+ throw new CoolException(wrkMast.getWrkNo() + "锛氬伐浣滅姸鎬佷笉鍖归厤");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -1249,7 +1253,7 @@
}
// 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
- openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo(),wrkMast.getBarcode());
+ openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣纭鎴愬姛鎺ㄩ�乬wcs");
return R.ok("鐩樼偣纭鎴愬姛");
@@ -1425,7 +1429,7 @@
}
// 鎺ㄩ�丟WCS鐩爣娑堟伅
- openServiceImpl.pushStaNoToGwcs(sourceStaNo,dto.getStaNo(),dto.getWorkNo(),barcode);
+ openServiceImpl.pushStaNoToGwcs(sourceStaNo,dto.getStaNo(),dto.getWorkNo(),barcode,"pda缁勬墭绔嬪嵆鍏ュ簱鎺ㄩ�乬wcs");
return R.ok("鍏ュ簱鍚姩鎴愬姛");
}
@@ -1511,12 +1515,340 @@
}
// 杩斿洖GWCS鐩爣淇℃伅
- boolean result = pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode());
+ openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(),"浜屾ゼ杩斾慨鍏ュ簱鎺ㄩ�乬wcs");
// 涓�妤煎弽淇搧鍏ュ簱鐨勬湪绠遍�氳繃鍖呰缁勫彿闇�缁檓es鎺ㄩ�佸緟鍒�
pushDpToMes(groupNos);
return R.ok("鍏ュ簱鎴愬姛");
+ }
+
+ @Override
+ @Transactional
+ public R pdtz(PdtzParam param) {
+
+ String barcode = param.getBarcode();
+ Integer palletizingNo = param.getPalletizingNo();
+ List<PdtzParam.MatList> matList = param.getMatList();
+ // 澧炲姞鍐椾綑瀛楁锛岀粰mes鎺ㄩ�佹椂缁撴瀯鍜屽叆搴撲繚瀛樹竴鑷�
+ for (PdtzParam.MatList matList1 : matList) {
+ matList1.setBarcode(barcode);
+ matList1.setPalletizingNo(palletizingNo);
+ }
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+
+ // 瀹炵墿鍖呰缁勫彿
+ List<String> groups = matList.stream().map(PdtzParam.MatList::getPackageGroupNo).distinct().collect(Collectors.toList());
+
+ // 搴撳瓨鏄庣粏鏈ㄧ浣嶇疆闆嗗悎
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
+ List<String> collect1 = locDetls.stream().map(LocDetl::getOrigin).distinct().collect(Collectors.toList());
+ // 宸ヤ綔鏄庣粏鏈ㄧ浣嶇疆闆嗗悎
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
+ List<String> collect2 = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
+ // 宸ヤ綔鐨勫寘瑁呯粍鍙�
+ List<String> wrkBrandlist = wrkDetls.stream().map(WrkDetl::getBrand).distinct().collect(Collectors.toList());
+ // 宸ヤ綔璁㈠崟鏄庣粏
+ List<OrderDetl> orderDetlList = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().in("brand", wrkBrandlist));
+
+ Date now = new Date();
+
+ // 鍒ゆ柇瑕佽皟鏁寸殑鏈ㄧ鎵�鍦ㄤ綅缃叧绯�
+ if (collect1.size() == 0 || collect2.size() == 0){
+ return R.parse(barcode+"锛氫换鍔″簱瀛樺紓甯革紒");
+ } else if(collect1.size() == 2 && collect2.size() == 1) { // 2鍑�1锛岄兘鏄崟绠辩殑
+ if (matList.size() == 0) { // 瀹炵墿鏄┖
+ // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+ locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+ // todo 鏍囪寮傚父锛屾帹閫乵es锛屽洖搴�
+ for(OrderDetl orderDetl:orderDetlList) {
+ orderDetl.setSource(1);
+ orderDetlMapper.updateById(orderDetl);
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("delete",wrkBrandlist);
+ kctzPushMes(jsonObject);
+ kctzReturn(wrkMast);
+ } else { // 瀹炵墿涓嶄负绌�
+ // 瀵绘壘瀹炵墿鐨勪綅缃�
+ List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().in("brand", groups).notIn("barcode",barcode));
+ if (locDetls1.size() == 0) { // 瀹炵墿鏃犲簱瀛�
+ // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+ locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+ // 琛ュ厖鏈ㄧ浣嶇疆
+ matList.get(0).setBoxPos(collect2.get(0));
+ // 鎶婂疄鐗╃墿鏂欎俊鎭斁鍏ヤ换鍔℃墍鍦ㄥ簱浣�
+ insertLocDetl(locMast.getLocNo(),barcode,matList);
+ // todo 鏍囪寮傚父锛屾帹閫乵es锛屽洖搴�
+ for(OrderDetl orderDetl:orderDetlList) {
+ orderDetl.setSource(1);
+ orderDetlMapper.updateById(orderDetl);
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("delete",wrkBrandlist);
+ jsonObject.put("insert",matList);
+ kctzPushMes(jsonObject);
+ kctzReturn(wrkMast);
+ }else { // 瀹炵墿鏈夊簱瀛�
+ List<String> brandList = locDetls1.stream().map(LocDetl::getBrand).distinct().collect(Collectors.toList());
+ return R.parse(brandList+"搴撳瓨宸插瓨鍦紝璇峰厛澶勭悊锛�");
+ }
+ }
+ } else if(collect1.size() == 1 && collect2.size() == 1) {
+ if (matList.size() == 0) { // 瀹炵墿涓虹┖
+ // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+ locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+ // 瀹屾垚杩欐潯鐩樼偣浠诲姟锛氭洿鏂拌鍗曞畬鎴愭暟閲忥紝宸ヤ綔涓绘。5
+ for(WrkDetl wrkDetl:wrkDetls) {
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ orderDetlMapper.updateOrderDetlQtyByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand());
+ }
+ }
+ if (locMast.getLocSts().equals("P")) {
+ locMast.setLocSts("O");
+ locMast.setBarcode("");
+ locMast.setSheetNo("");
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ locMastService.updateById(locMast);
+ }
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(5L);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+
+ // todo 鏍囪寮傚父锛屼笉鍥炲簱锛岀粰gwcs涓嬪彂鍘诲彔鐩樻満鍛戒护,鎺ㄩ�乵es
+ for(OrderDetl orderDetl:orderDetlList) {
+ orderDetl.setSource(1);
+ orderDetlMapper.updateById(orderDetl);
+ }
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("delete",wrkBrandlist);
+ kctzPushMes(jsonObject);
+
+ // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
+ openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),3013,wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣寮傚父璋冩暣鍚庡洖鍙犵洏鏈烘帹閫乬wcs");
+ } else { // 瀹炵墿涓嶄负绌�
+ // 瀵绘壘瀹炵墿鐨勪綅缃�
+ List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().in("brand", groups).notIn("barcode",barcode));
+ if (locDetls1.size() == 0) { // 瀹炵墿鏃犲簱瀛�
+ // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+ locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+ // 琛ュ厖鏈ㄧ浣嶇疆
+ for (PdtzParam.MatList matList1:matList) {
+ matList1.setBoxPos(collect2.get(0));
+ }
+ // 鎶婂疄鐗╃墿鏂欎俊鎭斁鍏ヤ换鍔℃墍鍦ㄥ簱浣�
+ insertLocDetl(locMast.getLocNo(),barcode,matList);
+ // todo 鏍囪寮傚父锛屽洖搴擄紝鎺ㄩ�乵es
+ for(OrderDetl orderDetl:orderDetlList) {
+ orderDetl.setSource(1);
+ orderDetlMapper.updateById(orderDetl);
+ }
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("delete",wrkBrandlist);
+ jsonObject.put("insert",matList);
+ kctzPushMes(jsonObject);
+
+ kctzReturn(wrkMast);
+ } else { // 瀹炵墿鏈夊簱瀛�
+ List<String> brandList = locDetls1.stream().map(LocDetl::getBrand).distinct().collect(Collectors.toList());
+ return R.parse(brandList+"搴撳瓨宸插瓨鍦紝璇峰厛澶勭悊锛�");
+ }
+ }
+ } else if (collect1.size() == 2 && collect2.size() == 2) {
+ if (matList.size() == 0) { // 瀹炵墿涓虹┖
+ // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+ locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+ // 瀹屾垚杩欐潯鐩樼偣浠诲姟锛氭洿鏂拌鍗曞畬鎴愭暟閲忥紝宸ヤ綔涓绘。5
+ for(WrkDetl wrkDetl:wrkDetls) {
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ orderDetlMapper.updateOrderDetlQtyByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand());
+ }
+ }
+ if (locMast.getLocSts().equals("P")) {
+ locMast.setLocSts("O");
+ locMast.setBarcode("");
+ locMast.setSheetNo("");
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ locMastService.updateById(locMast);
+ }
+ // 淇敼宸ヤ綔涓绘。鐘舵��
+ wrkMast.setWrkSts(5L);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+
+ // todo 鏍囪寮傚父锛屾帹閫乵es,涓嶅洖搴擄紝缁檊wcs涓嬪彂鍘诲彔鐩樻満鍛戒护
+ for(OrderDetl orderDetl:orderDetlList) {
+ orderDetl.setSource(1);
+ orderDetlMapper.updateById(orderDetl);
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("delete",wrkBrandlist);
+ jsonObject.put("insert",matList);
+ kctzPushMes(jsonObject);
+
+ // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
+ openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),3013,wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣寮傚父璋冩暣鍚庡洖鍙犵洏鏈烘帹閫乬wcs");
+ } else { // 瀹炵墿涓嶄负绌�
+ // 瀵绘壘瀹炵墿鐨勪綅缃�
+ List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>().in("brand", groups).notIn("barcode",barcode));
+ if (locDetls1.size() == 0) { // 瀹炵墿鏃犲簱瀛�
+ // 鎶婅浠诲姟鍦ㄥ簱鏄庣粏鍒犻櫎
+ locDetlService.delete(new EntityWrapper<LocDetl>().in("brand",wrkBrandlist));
+ // 琛ュ厖鏈ㄧ浣嶇疆
+ matList.get(0).setBoxPos("宸�");
+ matList.get(1).setBoxPos("鍙�");
+ // 鎶婂疄鐗╃墿鏂欎俊鎭斁鍏ヤ换鍔℃墍鍦ㄥ簱浣�
+ insertLocDetl(locMast.getLocNo(),barcode,matList);
+ // todo 鏍囪寮傚父锛屽洖搴擄紝鎺ㄩ�乵es
+ for(OrderDetl orderDetl:orderDetlList) {
+ orderDetl.setSource(1);
+ orderDetlMapper.updateById(orderDetl);
+ }
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("delete",wrkBrandlist);
+ jsonObject.put("insert",matList);
+ kctzPushMes(jsonObject);
+
+ kctzReturn(wrkMast);
+ } else { // 瀹炵墿鏈夊簱瀛�
+ List<String> brandList = locDetls1.stream().map(LocDetl::getBrand).distinct().collect(Collectors.toList());
+ return R.parse(brandList+"搴撳瓨宸插瓨鍦紝璇峰厛澶勭悊锛�");
+ }
+ }
+ }
+
+ return R.ok("璋冩暣鎴愬姛");
+ }
+
+ // 鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es
+ void kctzPushMes(JSONObject jsonObject) {
+ // 鎺ュ彛璇锋眰缁撴灉
+ boolean success = false;
+ // 鎺ュ彛璁板綍绌洪棿鍚嶇О
+ String message = "鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es";
+
+ // 鏋勯�犺姹備綋
+ String body = jsonObject.toJSONString();
+ String response = "";
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.MES_CC_IP_PORT)
+ .setPath(MesConstant.MES_CC_YCTZ_URL)
+ .setJson(body)
+ .build()
+ .doPost();
+ if (!Cools.isEmpty(response)) {
+ JSONObject result = JSON.parseObject(response);
+ if (result.getInteger("code").equals(200)) {
+ success = true;
+ }
+ } else {
+ log.error(message + "澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_YCTZ_URL, body, response);
+ }
+ } catch (Exception e) {
+ log.error(message + "寮傚父锛歿}", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ message,
+ MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_YCTZ_URL,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+ }
+
+ // 鐩樼偣寮傚父鍥炲簱
+ @Transactional
+ public void kctzReturn(WrkMast wrkMast) {
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", wrkMast.getIoType() - 50)
+ .eq("stn_no", wrkMast.getStaNo())
+ .eq("crn_no", wrkMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
+ Integer staNo = staDesc.getCrnStn();
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setWrkSts(14L); // 宸ヤ綔鐘舵��: 14.宸插嚭搴撴湭纭
+ wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+ wrkMast.setStaNo(staNo); // 鐩爣绔�
+ wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ locMast.setLocSts("Q");
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+
+ // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
+ openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo(),wrkMast.getBarcode(),"鐩樼偣寮傚父璋冩暣鍚庢帹閫乬wcs");
+ }
+
+ /**
+ * 璋冩暣搴撳瓨鏄庣粏
+ */
+ @Transactional
+ void insertLocDetl(String locNo, String barcode, List<PdtzParam.MatList> matList) {
+ Date now = new Date();
+ for (PdtzParam.MatList mat : matList) {
+ LocDetl locDetl = new LocDetl();
+ locDetl.setBatch("");
+ locDetl.setLocNo(locNo);
+ locDetl.setMatnr(mat.getSpecs()); // 瑙勬牸
+ locDetl.setMaktx(mat.getSpecs()); //瑙勬牸
+ locDetl.setUnit(mat.getBoxNo()); // 绠卞彿
+ locDetl.setModel(mat.getRollNo()); // 鍗峰彿
+ locDetl.setBrand(mat.getPackageGroupNo()); // 鍖呰缁勫彿
+ locDetl.setZpallet(barcode); // 鎵樼洏鐮�
+ locDetl.setBarcode(barcode);
+ locDetl.setOrigin(mat.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
+ locDetl.setColor(mat.getBoxType()); // 鏈ㄧ绫诲瀷
+ locDetl.setManu(mat.getRollType()); // 绠¤姱绫诲瀷
+ locDetl.setSku(mat.getWideInWidth()); // 瀹炴祴瀹藉箙
+ locDetl.setItemNum(mat.getThickness()); // 鐢熺當鍘氬害
+ locDetl.setManuDate(mat.getFqTime()); // 鍒嗗垏涓嬫枡鏃堕棿
+ locDetl.setWeight(mat.getNetWeight()); // 鍑�閲�
+ locDetl.setVolume(mat.getGrossWeight()); // 姣涢噸
+ locDetl.setLength(mat.getLength()); // 闀垮害
+ locDetl.setSpecs(String.valueOf(mat.getSplices())); // 鎺ュご
+ locDetl.setAnfme(1.0);
+// wrkDetl.setThreeCode(null); // 閫氳繃mes鎴杄xcel瀵煎叆妫�娴嬫槸鍚﹀悎鏍� 0涓嶅悎鏍硷紝1 鍚堟牸
+ locDetl.setAppeTime(now);
+ locDetl.setModiTime(now);
+ locDetlService.insert(locDetl);
+ }
}
/**
@@ -1575,67 +1907,6 @@
}
}
- public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode) {
- boolean success = false;
- // 鑾峰彇璇锋眰澶�
- Map<String, Object> headers = getHeaders();
-
- // 鏋勯�犺姹備綋
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("workNo", workNo);
- jsonObject.put("staNo", staNo);
- jsonObject.put("sourceStaNo", palletizingNo);
- jsonObject.put("barcode", barcode);
- String body = jsonObject.toJSONString();
- String response = "";
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.GWCS_IP_PORT)
- .setPath(MesConstant.GWCS_FPKW_URL)
- .setHeaders(headers)
- .setJson(body)
- .build()
- .doPost();
- if (!Cools.isEmpty(response)) {
- success = true;
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- } else {
- log.error("zmws鎺ㄩ�佸叆搴撶爜澶寸珯鐐规帴鍙ｅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("鍏ュ簱璇锋眰鎺ュ彛澶辫触锛歿}", e.getMessage());
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-// return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鍏ュ簱",
- MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL,
- null,
- "127.0.0.1",
- body,
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- return success;
- }
- Map<String, Object> getHeaders(){
- Map<String,Object> headers = new HashMap<>();
- headers.put("digi-type","sync ");
- headers.put("digi-protocol","raw");
- headers.put("digi-datakey"," XCommon.ImportData");
-
- return headers;
- }
private Map<String, String> getPackageGroupNoByGwms(List<String> boxNoList) {
Map<String, String> map = null;
Map<String, Object> headers = new HashMap<>();
--
Gitblit v1.9.1