From ed8bd2cd2634798298e90cf075a67173b154f0fa Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 18 八月 2025 14:19:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 134 insertions(+), 3 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 1df5114..0bf1a91 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1436,7 +1436,7 @@
@Override
public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {
- if (Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param,param.getMatList())) {
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�" + param);
}
if (Cools.isEmpty(param.getBarcode())) {
@@ -1468,6 +1468,7 @@
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
+ wrkMast.setWhsType(1); // 杩斾慨鍏ュ簱鏍囪瘑
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
@@ -1551,9 +1552,110 @@
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");
return R.ok("鍙嶄慨鍏ュ簱鎴愬姛");
+ }
+
+ @Override
+ public R pdaBoxIn(BoxInParam param, Long userId) {
+
+ if (Cools.isEmpty(param.getBarcode())) {
+ throw new CoolException("鏉＄爜涓嶈兘涓虹┖锛�" + param.getBarcode());
+ }
+
+ if (Cools.isEmpty(param.getAnfme())) {
+ throw new CoolException("璇疯緭鍏ユ暟閲�" + param.getAnfme());
+ }
+ if (Cools.isEmpty(param.getMemo())) {
+ throw new CoolException("璇疯緭鍏ュ娉�");
+ }
+ if (Cools.isEmpty(param.getOld())) {
+ throw new CoolException("璇疯緭鍏ユ柊鏃�" );
+ }
+
+ 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);
+ int iotype = 1; //绌虹
+
+ // 鏍规嵁婧愮珯鐐瑰鎵惧簱浣�
+ 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.setIoTime(new Date());
+ wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
+ wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(param.getPalletizingNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setAppeUser(userId);
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMastService.insert(wrkMast);
+
+ if (!Cools.isEmpty(param.getBatch())) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.setMatnr("绌虹");
+ wrkDetl.setSuppCode(param.getOld());
+ wrkDetl.setAnfme(param.getAnfme());
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setBatch(param.getBatch()); // 灏哄
+ wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ wrkDetl.setBarcode(param.getBarcode());
+ wrkDetl.setMemo(param.getMemo()); //澶囨敞
+ wrkDetl.setAnfme(param.getAnfme());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")) {
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ }
+
+ // 杩斿洖GWCS鐩爣淇℃伅
+ openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "涓�妤肩┖绠卞叆搴撴帹閫乬wcs");
+
+ return R.ok("绌虹鍏ュ簱鎴愬姛");
}
private void pushFxrkToMes(GwmsGenerateInventoryDto param) {
@@ -1928,7 +2030,7 @@
* 璋冩暣搴撳瓨鏄庣粏
*/
@Transactional
- void insertLocDetl(String locNo, String barcode, List<PdtzParam.MatList> matList) {
+ public void insertLocDetl(String locNo, String barcode, List<PdtzParam.MatList> matList) {
Date now = new Date();
for (PdtzParam.MatList mat : matList) {
LocDetl locDetl = new LocDetl();
@@ -2113,4 +2215,33 @@
}
return result;
}
+
+ @Override
+ public List<Map<String, Object>> pdaGetMemo() {
+ List<Integer> tagIds = Arrays.asList(7, 8,9);
+ List<Map<String, Object>> raw = matMapper.getBoxMemoMap(tagIds);
+
+ // 鐢� Map<String, List<String>> 鍒嗙粍
+ Map<String, List<String>> grouped = new HashMap<>();
+ for (Map<String, Object> row : raw) {
+ String tagId = String.valueOf(row.get("tag_id"));
+ String memo = String.valueOf(row.get("memo"));
+ if (memo == null || "null".equalsIgnoreCase(memo)) continue;
+
+ grouped.computeIfAbsent(tagId, k -> new ArrayList<>()).add(memo);
+ }
+
+ // 杞垚 List<Map<String, Object>> 缁撴瀯杩斿洖
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Map.Entry<String, List<String>> entry : grouped.entrySet()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("tagId", entry.getKey());
+ item.put("memos", entry.getValue());
+ result.add(item);
+ }
+
+ return result;
+ }
+
+
}
--
Gitblit v1.9.1