From 1dee71cb131b52cd6e9ed8995de4d07c3a879d68 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期六, 20 七月 2024 15:44:22 +0800 Subject: [PATCH] pda组托立即入库 --- src/main/java/com/zy/common/constant/MesConstant.java | 6 + src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 219 ++++++++++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/entity/param/PdaWarehousingNowParam.java | 31 +++++ src/main/java/com/zy/asrs/controller/MobileController.java | 13 ++ src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 30 ++-- src/main/java/com/zy/asrs/service/MobileService.java | 5 6 files changed, 288 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 2077292..5f4a301 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -563,4 +563,17 @@ } return mobileService.pdckqr(param); } + + @PostMapping("/pdaWarehousingNow") + @ManagerAuth(memo = "pda缁勬墭绔嬪嵆鍏ュ簱") + public synchronized R pdaWarehousingNow(@RequestBody PdaWarehousingNowParam param) { + + // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍� + if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getSourceStaNo())){ + return R.parse(BaseRes.PARAM); + } + return mobileService.pdaWarehousingNow(param, getUserId()); + + } + } diff --git a/src/main/java/com/zy/asrs/entity/param/PdaWarehousingNowParam.java b/src/main/java/com/zy/asrs/entity/param/PdaWarehousingNowParam.java new file mode 100644 index 0000000..1ea0903 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/param/PdaWarehousingNowParam.java @@ -0,0 +1,31 @@ +package com.zy.asrs.entity.param; + +import lombok.Data; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author pang.jiabao + * @description pda缁勬墭绔嬪嵆鍏ュ簱鍏ュ弬 + * @createDate 2024/7/19 18:25 + */ +@Data +public class PdaWarehousingNowParam { + + private String barcode;// 鎵樼洏鐮� + private Integer sourceStaNo;// 鍏ュ簱绔欑偣 + Map<String,List<Roll>> boxGroup = new HashMap<>(); // get("宸�") 宸﹁竟鐨勫嵎闆嗗悎 map鍥哄畾宸︿腑鍙充笁涓敭 + + @Data + public static class Roll { + private String rollNo; // 鍗峰彿 + private String boxNo; // 绠卞彿 + private String specs; //瑙勬牸 + private Double length; //闀垮害 + private Integer splices; //鎺ュご 涓� + private Double netWeight; // 鍑�閲� + private Double grossWeight; // 姣涢噸 + } +} diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java index b187f84..2a263c5 100644 --- a/src/main/java/com/zy/asrs/service/MobileService.java +++ b/src/main/java/com/zy/asrs/service/MobileService.java @@ -56,4 +56,9 @@ * @return 200鎴愬姛锛屽叾浠栧け璐� */ R pdckqr(PdckqrParam param); + + /** + * 浣跨敤pda缁勬墭绔嬪嵆鍏ュ簱 + */ + R pdaWarehousingNow(PdaWarehousingNowParam param, Long userId); } 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 472cf6a..5369a27 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -26,6 +26,7 @@ import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * 绉诲姩绔湇鍔℃牳蹇冪被 @@ -1249,7 +1250,223 @@ return R.error("鐩樼偣纭寮傚父"); } - /** + @Override + @Transactional + public R pdaWarehousingNow(PdaWarehousingNowParam param, Long userId) { + + String barcode = param.getBarcode(); + Integer sourceStaNo = param.getSourceStaNo(); + + int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", barcode)); + if (zpalletCount > 0) { + throw new CoolException("搴撳瓨鎵樼洏鐮佸凡瀛樺湪锛�" + barcode); + } + + int barcodeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", barcode)); + if (barcodeCount > 0) { + throw new CoolException("宸ヤ綔妗e凡瀛樺湪璇ユ墭鐩樼爜锛�" + barcode); + } + + Map<String, List<PdaWarehousingNowParam.Roll>> boxGroup = param.getBoxGroup(); + List<PdaWarehousingNowParam.Roll> leftPosList = boxGroup.get("宸�"); + List<PdaWarehousingNowParam.Roll> centrePosList = boxGroup.get("涓�"); + List<PdaWarehousingNowParam.Roll> rightPosList = boxGroup.get("鍙�"); + + // 鏍规嵁绠卞彿鑾峰彇鍖呰缁勫彿 + List<String> boxNoList = leftPosList.stream().map(PdaWarehousingNowParam.Roll::getBoxNo).distinct().collect(Collectors.toList()); + boxNoList.addAll(centrePosList.stream().map(PdaWarehousingNowParam.Roll::getBoxNo).distinct().collect(Collectors.toList())); + boxNoList.addAll(rightPosList.stream().map(PdaWarehousingNowParam.Roll::getBoxNo).distinct().collect(Collectors.toList())); + Map<String, String> map = new HashMap<>(); +// if (boxNoList.size() > 0) { +// map = getPackageGroupNoByGwms(boxNoList); +// } + + LocTypeDto locTypeDto = new LocTypeDto(); + locTypeDto.setLocType1((short)1); + + // 鏍规嵁婧愮珯鐐瑰鎵惧簱浣� + StartupDto dto = commonService.getLocNo(1, sourceStaNo, locTypeDto); + + int workNo = dto.getWorkNo(); + Date now = new Date(); + // 鐢熸垚宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(new Date()); + wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱id + wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱 + wrkMast.setIoPri(13D); // 浼樺厛绾� + wrkMast.setCrnNo(dto.getCrnNo()); + wrkMast.setSourceStaNo(dto.getSourceStaNo()); + wrkMast.setStaNo(dto.getStaNo()); + wrkMast.setLocNo(dto.getLocNo()); + wrkMast.setBarcode(barcode); // 鎵樼洏鐮� + wrkMast.setFullPlt("Y"); // 婊℃澘锛歒 + wrkMast.setPicking("N"); // 鎷f枡 + wrkMast.setExitMk("N"); // 閫�鍑� + wrkMast.setEmptyMk("N"); // 绌烘澘 + wrkMast.setLinkMis("Y"); + wrkMast.setCtnType(1); // 瀹瑰櫒绫诲瀷 + // 鎿嶄綔浜哄憳鏁版嵁 + wrkMast.setAppeTime(now); + wrkMast.setModiTime(now); + wrkMast.setAppeUser(userId); + wrkMast.setModiUser(userId); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + + + for (PdaWarehousingNowParam.Roll roll: leftPosList) { + WrkDetl wrkDetl = new WrkDetl(); + wrkDetl.setWrkNo(workNo); + wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸 + wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸 + wrkDetl.setBatch(roll.getBoxNo()); // 绠卞彿 + wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿 + wrkDetl.setBrand(map.get(roll.getBoxNo()) == null ? "" : map.get(roll.getBoxNo())); // 鍖呰缁勫彿 + wrkDetl.setZpallet(barcode); // 鎵樼洏鍚� + wrkDetl.setOrigin("宸�"); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃� + wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲� + wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸 + wrkDetl.setPrice(roll.getLength()); + wrkDetl.setSpecs(String.valueOf(roll.getSplices())); + wrkDetl.setAnfme(1.0); + wrkDetl.setIoTime(now); + wrkDetl.setAppeTime(now); + wrkDetl.setModiTime(now); + wrkDetl.setAppeUser(userId); + wrkDetl.setModiUser(userId); + if (!wrkDetlService.insert(wrkDetl)) { + throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触"); + } + } + + for (PdaWarehousingNowParam.Roll roll: centrePosList) { + WrkDetl wrkDetl = new WrkDetl(); + wrkDetl.setWrkNo(workNo); + wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸 + wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸 + wrkDetl.setBatch(roll.getBoxNo()); // 绠卞彿 + wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿 + wrkDetl.setBrand(map.get(roll.getBoxNo()) == null ? "" : map.get(roll.getBoxNo())); // 鍖呰缁勫彿 + wrkDetl.setZpallet(barcode); // 鎵樼洏鍚� + wrkDetl.setOrigin("涓�"); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃� + wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲� + wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸 + wrkDetl.setPrice(roll.getLength()); + wrkDetl.setSpecs(String.valueOf(roll.getSplices())); + wrkDetl.setAnfme(1.0); + wrkDetl.setIoTime(now); + wrkDetl.setAppeTime(now); + wrkDetl.setModiTime(now); + wrkDetl.setAppeUser(userId); + wrkDetl.setModiUser(userId); + if (!wrkDetlService.insert(wrkDetl)) { + throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触"); + } + } + + for (PdaWarehousingNowParam.Roll roll: rightPosList) { + WrkDetl wrkDetl = new WrkDetl(); + wrkDetl.setWrkNo(workNo); + wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸 + wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸 + wrkDetl.setBatch(roll.getBoxNo()); // 绠卞彿 + wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿 + wrkDetl.setBrand(map.get(roll.getBoxNo()) == null ? "" : map.get(roll.getBoxNo())); // 鍖呰缁勫彿 + wrkDetl.setZpallet(barcode); // 鎵樼洏鍚� + wrkDetl.setOrigin("鍙�"); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃� + wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲� + wrkDetl.setVolume(roll.getGrossWeight()); // 姣涢噸 + wrkDetl.setPrice(roll.getLength()); + wrkDetl.setSpecs(String.valueOf(roll.getSplices())); + wrkDetl.setAnfme(1.0); + wrkDetl.setIoTime(now); + wrkDetl.setAppeTime(now); + wrkDetl.setModiTime(now); + wrkDetl.setAppeUser(userId); + wrkDetl.setModiUser(userId); + 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()+"鐩爣搴撲綅宸茶鍗犵敤"); + } + + // 鎺ㄩ�丟WCS鐩爣娑堟伅 + openServiceImpl.pushStaNoToGwcs(sourceStaNo,dto.getStaNo(),dto.getWorkNo()); + return R.ok("鍏ュ簱鍚姩鎴愬姛"); + } + + private Map<String, String> getPackageGroupNoByGwms(List<String> boxNoList) { + Map<String, String> map = null; + Map<String, Object> headers = new HashMap<>(); + headers.put("Content-Type", "application/json;charset=UTF-8"); + + JSONObject jsonObject = new JSONObject(); + jsonObject.put("boxNoList", JSONObject.toJSONString(boxNoList)); + String body = jsonObject.toJSONString(); + boolean success = false; + String response = ""; + try { + response = new HttpHandler.Builder() + .setUri(MesConstant.GWMS_IP_PORT) + .setPath(MesConstant.GWMS_GET_GROUP_NO_URL) + .setHeaders(headers) + .setJson(body) + .build() + .doPost(); + if (!Cools.isEmpty(response)) { + JSONObject jsonObject1 = JSONObject.parseObject(response); + int code = (int) jsonObject1.get("code"); + String msg = (String) jsonObject1.get("msg"); + if (code != 200) { + throw new CoolException(msg); + } + map = (Map<String, String>) jsonObject1.get("data"); + success = true; + + } else { + log.error("pda缁勬墭鍏ュ簱璇锋眰gwms鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response); + } + } catch (Exception e) { + log.error("pda缁勬墭鍏ュ簱璇锋眰gwms鎺ュ彛寮傚父锛屽伐浣滃彿锛歿}锛寋}", boxNoList.toString(), e.getMessage()); + } finally { + try { + // 淇濆瓨鎺ュ彛鏃ュ織 + apiLogService.save( + "pda缁勬墭鍏ュ簱璇锋眰gwms鎺ュ彛", + MesConstant.URL + MesConstant.PAKIN_URL, + null, + "127.0.0.1", + body, + response, + success + ); + } catch (Exception e) { + log.error("鎺ュ彛鏃ュ織淇濆瓨寮傚父", e); + } + } + + if (map == null) { + throw new CoolException("璇锋眰gwcs鏌ヨ鍖呰缁勫彿寮傚父"); + } + return map; + } + + /** * 姣旇緝涓や釜闆嗗悎鐨勭被鐨勫睘鎬э紝鐩稿悓鍒欐姷娑堬紝鏈�鍚庡垽鏂袱涓泦鍚堟槸鍚﹀畬鍏ㄦ姷娑� */ public boolean compareAndCheckCancellation(List<WrkDetl> list1, List<PdckqrParam.Material> list2) { diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 869bbeb..3b812c3 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -1045,26 +1045,26 @@ WrkDetl wrkDetl = new WrkDetl(); wrkDetl.setWrkNo(wrkMast.getWrkNo()); obj.getRolls().forEach(roll -> { - Mat mat = matService.selectByMatnr(roll.getSpecs()); - if (mat == null) { - mat = new Mat(); - mat.setTagId(6L); - mat.setMatnr(roll.getSpecs()); - mat.setMaktx(roll.getSpecs()); - mat.setSpecs(roll.getSpecs()); - mat.setStatus(1); - mat.setCreateTime(now); - mat.setUpdateTime(now); - if (!matService.insert(mat)) { - throw new CoolException("鐗╂枡瀵煎叆澶辫触锛�"); - } - } +// Mat mat = matService.selectByMatnr(roll.getSpecs()); +// if (mat == null) { +// mat = new Mat(); +// mat.setTagId(6L); +// mat.setMatnr(roll.getSpecs()); +// mat.setMaktx(roll.getSpecs()); +// mat.setSpecs(roll.getSpecs()); +// mat.setStatus(1); +// mat.setCreateTime(now); +// mat.setUpdateTime(now); +// if (!matService.insert(mat)) { +// throw new CoolException("鐗╂枡瀵煎叆澶辫触锛�"); +// } +// } wrkDetl.setWrkNo(wrkMast.getWrkNo()); wrkDetl.setMatnr(roll.getSpecs()); // 瑙勬牸 wrkDetl.setMaktx(roll.getSpecs()); //瑙勬牸 wrkDetl.setBatch(roll.getBoxNo()); // 绠卞彿 wrkDetl.setModel(roll.getRollNo()); // 鍗峰彿 - wrkDetl.setBrand(""); // 鏈ㄧ绫诲瀷 + wrkDetl.setBrand(obj.getPackageGroupNo()); // 鍖呰缁勫彿 wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鍚� wrkDetl.setOrigin(obj.getBoxPos()); // 鏈ㄧ鍦ㄦ墭鐩樹綅缃� wrkDetl.setWeight(roll.getNetWeight()); // 鍑�閲� diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java index 9bb08ee..564b626 100644 --- a/src/main/java/com/zy/common/constant/MesConstant.java +++ b/src/main/java/com/zy/common/constant/MesConstant.java @@ -16,10 +16,16 @@ // GWCS鎺ュ彛IP鍦板潃 public static final String GWCS_IP_PORT = "http://192.168.14.249:8008"; + // GWMS鎺ュ彛IP鍦板潃 + public static final String GWMS_IP_PORT = "http://192.168.14.249:8008"; + // ZWMS涓嬪彂鍏ュ簱(鍒嗛厤搴撲綅) public static final String GWCS_FPKW_URL = "/api/Task/InventoryTask"; // 涓嬪彂鍑哄簱鐮佸ご鍒板嚭搴撳彛鍛戒护 public static final String GWCS_DCKK_URL = "/api/Task/InventoryTask"; + // 鑾峰彇绠卞彿瀵瑰簲鍖呰缁勫彿 + public static final String GWMS_GET_GROUP_NO_URL = "/api/Task/InventoryTask"; + } -- Gitblit v1.9.1