From 75a2f28ecf1e50926ca417c7d69075bfa046fcfb Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期五, 20 六月 2025 09:53:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 189 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 149 insertions(+), 40 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 be1cef1..fc60578 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1434,27 +1434,44 @@
}
@Override
- public R pdaFxprk(FxprkParam param, Long userId) {
+ public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {
- // 鏍规嵁鍖呰缁勫彿鑾峰彇鍒版湪绠卞嵎淇℃伅
- List<String> groupNos = param.getBoxList().stream().map(FxprkParam.Box::getPackageGroupNo).collect(Collectors.toList());
- List<Mat> list = matService.selectList(new EntityWrapper<Mat>().in("brand", groupNos));
- if (list.isEmpty()) {
- throw new CoolException("娌℃湁鏌ヨ鍒拌鍖呰缁勫彿淇℃伅锛�" + param.getBoxList().toString());
+ if (Cools.isEmpty(param,param.getMatList())) {
+ throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�" + param);
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ throw new CoolException("鏉＄爜涓嶈兘涓虹┖锛�" + param.getBarcode());
+ }
+
+ int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (zpalletCount > 0) {
+ throw new CoolException("搴撳瓨鎵樼洏鐮佸凡瀛樺湪锛�" + param.getBarcode());
+ }
+
+ int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ if (barcodeCount > 0) {
+ throw new CoolException("宸ヤ綔妗ｅ凡瀛樺湪璇ユ墭鐩樼爜锛�" + param.getBarcode());
}
LocTypeDto locTypeDto = new LocTypeDto();
locTypeDto.setLocType1((short) 1);
- StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);
+ int iotype = 1;
+ if (Cools.isEmpty(param.getMatList())) {
+ iotype = 10;
+ }
+
+ // 鏍规嵁婧愮珯鐐瑰鎵惧簱浣�
+ StartupDto dto = commonService.getLocNo(iotype, param.getPalletizingNo(), locTypeDto, 0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
+ wrkMast.setWhsType(1); // 杩斾慨鍏ュ簱鏍囪瘑
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(param.getPalletizingNo());
@@ -1470,36 +1487,53 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setAppeUser(userId);
- wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
+ wrkMast.setModiUser(userId);
+ wrkMastService.insert(wrkMast);
- for (Mat obj : list) {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(obj);
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setAnfme(1.0);
- // 閲嶆柊瀹氫綅鏈ㄧ浣嶇疆
- for (FxprkParam.Box box :param.getBoxList()) {
- if (box.getPackageGroupNo().equals(obj.getBrand())) {
- if (!box.getBoxPos().equals(obj.getOrigin()) || !wrkDetl.getZpallet().equals(param.getBarcode())) {
- wrkDetl.setOrigin(box.getBoxPos());
- wrkDetl.setZpallet(param.getBarcode());
- wrkDetl.setBarcode(param.getBarcode());
- matMapper.updateBoxPos(box.getPackageGroupNo(), box.getBoxPos(),param.getBarcode());
+ if (!Cools.isEmpty(param.getMatList())) {
+ List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
+ List<String> groupNos = new ArrayList<>();
+ for (GwmsGenerateInventoryDto.MatList obj : matList) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ obj.getRolls().forEach(roll -> {
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸
+ wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸
+ wrkDetl.setUnit(roll.getBoxNo()); // 绠卞彿
+ wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿
+ wrkDetl.setBrand(obj.getPackageGroupNo()); // 鍖呰缁勫彿
+ wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ wrkDetl.setBarcode(param.getBarcode());
+ wrkDetl.setOrigin(obj.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃�
+ wrkDetl.setColor(obj.getBoxType()); // 鏈ㄧ绫诲瀷
+ wrkDetl.setManu(obj.getRollType()); // 绠¤姱绫诲瀷
+ wrkDetl.setSku(obj.getWideInWidth()); // 瀹炴祴瀹藉箙
+ wrkDetl.setItemNum(obj.getThickness()); // 鐢熺當鍘氬害
+ wrkDetl.setManuDate(roll.getFqTime()); // 鍒嗗垏涓嬫枡鏃堕棿
+ wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲�
+ wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸
+ wrkDetl.setLength(roll.getLength()); // 闀垮害
+ wrkDetl.setSpecs(String.valueOf(roll.getSplices())); // 鎺ュご
+ wrkDetl.setAnfme(1.0);
+// wrkDetl.setThreeCode(null); // 閫氳繃mes鎴杄xcel瀵煎叆妫�娴嬫槸鍚﹀悎鏍� 0涓嶅悎鏍硷紝1 鍚堟牸
+// wrkDetl.setDeadWarn(); // 鐞嗚揣鏍囪瘑 0榛樿锛�1鐞嗚揣涓紝2鐞嗚揣瀹屾垚w
+// wrkDetl.setInspect(); // 璁㈠崟鏄庣粏涓敤锛屾爣璇嗗璐х殑鐘舵�� 0鏈璐э紝1澶囪揣涓紝2澶囪揣瀹屾垚
+// wrkDetl.setDanger(); // 璁㈠崟鏄庣粏涓敤锛屾爣璇嗚法宸烽亾绉诲簱 0鏈Щ搴擄紝1绉诲簱涓紝2绉诲簱瀹屾垚
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
- break;
- }
+ });
+ groupNos.add(obj.getPackageGroupNo());
}
- wrkDetl.setIoTime(now);
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
+ // 涓�妤煎弽淇搧鍏ュ簱鐨勬湪绠遍�氳繃鍖呰缁勫彿闇�缁檓es鎺ㄩ�佸緟鍒�
+ pushDpToMes(groupNos);
}
// 鏇存柊鐩爣搴撲綅鐘舵��
@@ -1514,13 +1548,67 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 涓�妤艰繑淇叆搴撴帹閫乵es鍋氳褰�
+ pushFxrkToMes(param);
+
// 杩斿洖GWCS鐩爣淇℃伅
- openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(),"浜屾ゼ杩斾慨鍏ュ簱鎺ㄩ�乬wcs");
+ openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "涓�妤艰繑淇叆搴撴帹閫乬wcs");
- // 涓�妤煎弽淇搧鍏ュ簱鐨勬湪绠遍�氳繃鍖呰缁勫彿闇�缁檓es鎺ㄩ�佸緟鍒�
- pushDpToMes(groupNos);
+ return R.ok("鍙嶄慨鍏ュ簱鎴愬姛");
+ }
- return R.ok("鍏ュ簱鎴愬姛");
+ private void pushFxrkToMes(GwmsGenerateInventoryDto param) {
+
+ for (GwmsGenerateInventoryDto.MatList matList : param.getMatList()){
+ matList.setOutOrIn("in");
+ matList.setStockType("杩斾慨鍏ュ簱");
+ }
+
+ boolean success = false;
+ // 鑾峰彇璇锋眰澶�
+ Map<String,Object> headers = new HashMap<>();
+ headers.put("Content-Type","application/json;charset=UTF-8");
+
+ // 鏋勯�犺姹備綋
+ String body = JSON.toJSONString(param);
+ String response = "";
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.MES_CC_IP_PORT)
+ .setPath(MesConstant.MES_CC_FXRK_URL)
+ .setHeaders(headers)
+ .setJson(body)
+ .build()
+ .doGet();
+ if (!Cools.isEmpty(response)) {
+ JSONObject jsonObject1 = JSONObject.parseObject(response);
+ int code = (int) jsonObject1.get("code");
+ boolean state = jsonObject1.getBoolean("state");
+ if (code == 200 && state) {
+ success = true;
+ }
+ } else {
+ log.error("杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL, body, response);
+ }
+ } catch (Exception e) {
+ log.error("杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍寮傚父锛歿}", e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "杩斾慨鍏ュ簱鎺ㄩ�乵es璁板綍",
+ MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_FXRK_URL,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+
}
@Override
@@ -1730,6 +1818,27 @@
return R.ok("璋冩暣鎴愬姛");
}
+ @Override
+ public R pdaFhhd(PdaDhhdParam param, Long userId) {
+
+ String orderNo = param.getOrderNo();
+
+ Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ return R.parse("鍗曟嵁缂栧彿涓嶅瓨鍦細" + orderNo);
+ } else if (!order.getSettle().equals(4L)) {
+ return R.parse("鍗曟嵁鐘舵�佷笉涓�4.宸插畬鎴�");
+ }
+
+ order.setSettle(5L);
+ order.setUpdateBy(userId);
+ order.setUpdateTime(new Date());
+
+ orderService.updateById(order);
+
+ return R.ok("鍙戣揣鏍稿鎴愬姛");
+ }
+
// 鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es
void kctzPushMes(JSONObject jsonObject) {
// 鎺ュ彛璇锋眰缁撴灉
@@ -1884,7 +1993,7 @@
}
throw new CoolException(msg);
} else {
- log.error("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_IP_PORT, body, response);
+ log.error("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL, body, response);
throw new CoolException("杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒ゅけ璐�");
}
} catch (Exception e) {
@@ -1894,7 +2003,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"杩斾慨鍝佸叆搴撶粰mes鎺ㄩ�佸緟鍒�",
- MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_IP_PORT,
+ MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_DP_URL,
null,
"127.0.0.1",
body,
--
Gitblit v1.9.1