From 18c51d40be82435289ba3be6bd5f8e15fdf786f7 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期六, 04 四月 2026 00:26:56 +0800
Subject: [PATCH] mqtt
---
src/main/java/com/zy/common/web/WcsController.java | 296 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 181 insertions(+), 115 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 77f6dc8..f5adbea 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -52,42 +52,47 @@
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ private StaDescService staDescService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
+ long startTime = System.currentTimeMillis();
+ String barcode = param == null ? null : param.getBarcode();
+ Integer sourceStaNo = param == null ? null : param.getSourceStaNo();
+ try {
+ if(param.getBarcode().contains("-") || param.getBarcode().contains("gsl")){
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ List<WaitPakin> waitPakins = null;
- if(param.getBarcode().contains("-") || param.getBarcode().contains("gsl")){
- log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- }
- if (Cools.isEmpty(param.getSourceStaNo())) {
- return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
- }
- List<WaitPakin> waitPakins = null;
-
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜涓嶈兘涓虹┖");
- }
- WrkMast wrkMast1 = wrkMastService.selectByBarcode(param.getBarcode());
- if (!Cools.isEmpty(wrkMast1) && wrkMast1.getWrkSts() == 2) {
- StartupDto dto1 = new StartupDto();
- dto1.setBarcode(param.getBarcode());
- dto1.setStaNo(Integer.valueOf(wrkMast1.getStaNo()));
- String wcsLoc = Utils.WMSLocToWCSLoc(wrkMast1.getLocNo());
- dto1.setLocNo(wcsLoc);
- dto1.setCrnNo(wrkMast1.getCrnNo());
- dto1.setWorkNo(wrkMast1.getWrkNo());
- dto1.setTaskNo(wrkMast1.getWrkNo() + "");
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+ WrkMast wrkMast1 = wrkMastService.selectByBarcode(param.getBarcode());
+ if (!Cools.isEmpty(wrkMast1) && wrkMast1.getWrkSts() == 2) {
+ StartupDto dto1 = new StartupDto();
+ dto1.setBarcode(param.getBarcode());
+ dto1.setStaNo(Integer.valueOf(wrkMast1.getStaNo()));
+ String wcsLoc = Utils.WMSLocToWCSLoc(wrkMast1.getLocNo());
+ dto1.setLocNo(wcsLoc);
+ dto1.setCrnNo(wrkMast1.getCrnNo());
+ dto1.setWorkNo(wrkMast1.getWrkNo());
+ dto1.setTaskNo(wrkMast1.getWrkNo() + "");
// dto1.setTaskPri((int) Math.round(wrkMast1.getIoPri()));
- return R.ok(dto1);
- }
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1));
- if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 10) {
- return R.error("闄愯");
- }
- waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins)) {
- return R.error("璇峰厛娣诲姞鍏ュ簱閫氱煡妗�");
+ return R.ok(dto1);
+ }
+// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1));
+// if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 10) {
+// return R.error("闄愯");
+// }
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(waitPakins)) {
+ return R.error("璇峰厛娣诲姞鍏ュ簱閫氱煡妗�");
// WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
// if (wrkMast != null && wrkMast.getIoType() == 103) {
// return R.parse(CodeRes.PICK_600);
@@ -112,24 +117,30 @@
// return R.error("鑷姩鐢熸垚鍏ュ簱閫氱煡妗ｅ悗鏈煡璇㈠埌鏁版嵁");
// }
// log.info("WCS鍏ュ簱鎺ュ彛鑷姩鐢熸垚鍏ュ簱閫氱煡妗�, zpallet:{}, matnr:{}, anfme:{}", param.getBarcode(), "32149", 1D);
- }
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- return R.error(CodeRes.EXIST_500);
- }
- if (Cools.isEmpty(param.getLocType1())) {
- return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
- }
+ }
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error(CodeRes.EXIST_500);
+ }
+ if (Cools.isEmpty(param.getLocType1())) {
+ return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+ }
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
- sourceStaNo.setLocType1(param.getLocType1());
- LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNoEntity = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ sourceStaNoEntity.setLocType1(param.getLocType1());
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNoEntity);
+ if (waitPakins.get(0).getMatnr().equals("emptyPallet")) {
+ locTypeDto.setLocType2((short) 1);
+ }
- StartupDto dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins, param.getRow());
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
- return R.ok().add(dto);
+ StartupDto dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
+ } finally {
+ log.info("WCS鍏ュ簱鎺ュ彛鎬昏�楁椂:{}ms, sourceStaNo:{}, barcode:{}", System.currentTimeMillis() - startTime, sourceStaNo, barcode);
+ }
}
@PostMapping("/pakin/agv/loc/v1")
@@ -433,89 +444,144 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins, List<Integer> recommendRows) {
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
- // 妫�绱㈠簱浣�
- List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ long startTime = System.currentTimeMillis();
+ try {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+ // 妫�绱㈠簱浣�
+ List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
+ FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
- StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, recommendRows);
- int workNo = dto.getWorkNo();
- Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱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"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- waitPakins.forEach(waitPakin -> {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(waitPakin);
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ // IoT 鎸囧畾浜嗙洰鏍囧簱浣嶆椂浼樺厛灏濊瘯璇ュ簱浣嶏紱涓嶅彲鐢ㄦ椂鍐嶉��鍥炵幇鏈夎嚜鍔ㄦ壘浣嶈鍒欍��
+ StartupDto dto = buildPreferredStartupDto(devpNo, extractPreferredInboundLoc(waitPakins));
+ if (dto == null) {
+ dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto);
}
- });
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", barcode);
- WaitPakin setParam = new WaitPakin();
- setParam.setLocNo(dto.getLocNo());
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
- throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
- }
+ int workNo = dto.getWorkNo();
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱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"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ // 鎶� referenceId/orderNo 閫忎紶鍒板伐浣滀富妗ｏ紝渚夸簬浣滀笟瀹屾垚鍚庣户缁洖浼犵粰 IoT銆�
+ wrkMast.setUserNo(waitPakins.get(0).getOrderNo());
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ waitPakins.forEach(waitPakin -> {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+ .eq("zpallet", barcode);
+ WaitPakin setParam = new WaitPakin();
+ setParam.setLocNo(dto.getLocNo());
+ setParam.setIoStatus("Y");
+ setParam.setModiTime(now);
+ if (!waitPakinService.update(setParam, wrapper)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
// // 鏇存柊婧愮珯鐐逛俊鎭�
// sourceStaNo.setWrkNo(workNo);
// sourceStaNo.setModiTime(now);
// if (!basDevpService.updateById(sourceStaNo)){
// 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("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ 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() + "鐩爣搴撲綅宸茶鍗犵敤");
}
- } else {
- throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
+ String wcsLoc = Utils.WMSLocToWCSLoc(dto.getLocNo());
+ dto.setLocNo(wcsLoc);
+ dto.setTaskNo(workNo + "");
+ return dto;
+ } finally {
+ log.info("startupFullPutStore鑰楁椂:{}ms, sourceStaNo:{}, barcode:{}", System.currentTimeMillis() - startTime, devpNo, barcode);
}
- String wcsLoc = Utils.WMSLocToWCSLoc(dto.getLocNo());
- dto.setLocNo(wcsLoc);
- dto.setTaskNo(workNo + "");
+ }
+
+ /**
+ * 鎸囧畾搴撲綅鏆傚瓨鍦ㄥ叆搴撻�氱煡妗� manu 瀛楁锛岀瓑 WCS 鐪熸寤轰换鍔℃椂鍐嶈鍙栥��
+ */
+ private String extractPreferredInboundLoc(List<WaitPakin> waitPakins) {
+ if (Cools.isEmpty(waitPakins)) {
+ return null;
+ }
+ for (WaitPakin waitPakin : waitPakins) {
+ if (!Cools.isEmpty(waitPakin.getManu())) {
+ return waitPakin.getManu();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鎶婅繙绔寚瀹氬簱浣嶈浆鎹㈡垚鍙洿鎺ヤ笅鍙戠粰 WCS 鐨勭洰鏍囩珯鍙板拰浣滀笟鍙傛暟銆�
+ * 濡傛灉搴撲綅宸插崰鐢ㄦ垨瀵瑰簲璁惧涓嶅湪鑷姩妯″紡锛屽垯杩斿洖 null 浜ょ粰鍘熸湁鎵句綅閫昏緫澶勭悊銆�
+ */
+ private StartupDto buildPreferredStartupDto(Integer sourceStaNo, String preferredLocNo) {
+ if (Cools.isEmpty(preferredLocNo)) {
+ return null;
+ }
+ LocMast targetLoc = locMastService.selectById(preferredLocNo);
+ if (targetLoc == null || !"O".equalsIgnoreCase(targetLoc.getLocSts())) {
+ return null;
+ }
+ StaDesc staDesc = staDescService.queryCrnStn(targetLoc.getCrnNo());
+ if (staDesc == null) {
+ return null;
+ }
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (staNo == null || !"Y".equalsIgnoreCase(staNo.getAutoing())) {
+ return null;
+ }
+ StartupDto dto = new StartupDto();
+ dto.setWorkNo(commonService.getWorkNo(0));
+ dto.setCrnNo(targetLoc.getCrnNo());
+ dto.setSourceStaNo(sourceStaNo);
+ dto.setStaNo(staNo.getDevNo());
+ dto.setLocNo(targetLoc.getLocNo());
return dto;
}
@Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
--
Gitblit v1.9.1