From 47dc5ae0a4e1173c794f151349ce9a07576d0888 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 30 七月 2024 18:48:40 +0800
Subject: [PATCH] 图标修改
---
src/main/java/com/zy/common/web/WcsController.java | 207 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 186 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 2bfec11..3798a5f 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -44,11 +44,18 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private LocDetlService locDetlService;
+ private LocDetlService locDetlService;
@Autowired
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+
+ @Autowired
+ private StaDescService staDescService;
+
+ @Autowired
+ private OrderService orderService;
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -73,13 +80,13 @@
}
return R.parse(CodeRes.NO_COMB_700);
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ 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())){
+ if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -104,14 +111,164 @@
return R.ok().add(dto);
}
+ @PostMapping("/pakin2/loc/v1")
+ @ResponseBody
+ @Transactional
+ public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰2====>>鍏ュ弬:{}", param);
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
+ sourceStaNo.setLocType1(param.getLocType1());
+// LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1((short) 1);
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .eq("io_type", param.getIoType())
+ .eq("wrk_sts", 14));
+ StartupDto dto = new StartupDto();
+
+ if (Cools.isEmpty(wrkMast)) {
+ try {
+ log.info("/pakin2/loc/v1:" + dto + "======鎵樼洏鐮�:" + param.getBarcode() + "姝ょ瑪宸ヤ綔妗ｆ湭鏌ヨ鍒扮洏鐐�/鎷ｆ枡鍑哄簱浠诲姟锛屽紑濮嬫煡璇㈢洏鐐�/鎷ｆ枡鍐嶅叆搴撲换鍔�==銆�");
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .eq("io_type", param.getIoType() - 50)
+ .eq("wrk_sts", 2));
+ if (Cools.isEmpty(wrkMast1)) {
+ return R.error("鏈煡璇㈠埌宸ヤ綔妗�===銆嬫墭鐩樼爜:" + param.getBarcode());
+ }
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", param.getIoType() - 50)
+ .eq("stn_no", sourceStaNo.getDevNo())
+ .eq("crn_no", wrkMast1.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", param.getIoType() - 50, sourceStaNo, wrkMast1.getCrnNo());
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())) {
+ throw new CoolException("鍫嗗灈鏈轰綔涓氱珯鐐逛笌宸ヤ綔鍙风洰鏍囩珯鐐逛笉涓�鑷达紒锛侊紒璇疯仈绯诲伐绋嬪笀淇敼" +
+ "\\n鍫嗗灈鏈哄彿锛�" + wrkMast1.getCrnNo() +
+ "\\n鍫嗗灈鏈虹珯鐐癸細" + staDesc.getCrnStn() +
+ "\\n宸ヤ綔鍙凤細" + wrkMast1.getWrkNo() +
+ "\\n宸ヤ綔妗ｇ洰鏍囩珯鐐癸細" + wrkMast1.getStaNo());
+ }
+ dto.setWorkNo(wrkMast1.getWrkNo());
+ dto.setCrnNo(wrkMast1.getCrnNo());
+ dto.setLocNo(wrkMast1.getLocNo());
+ dto.setStaNo(wrkMast1.getStaNo());
+ dto.setSourceStaNo(wrkMast1.getSourceStaNo());
+ log.info("/pakin2/loc/v1:" + dto + "======鎵樼洏鐮�:" + param.getBarcode() + "姝ょ瑪宸ヤ綔妗ｅ凡缁忔槸鐩樼偣鍐嶅叆搴撶姸鎬侊紝杩斿洖wcs涓嬪彂淇℃伅");
+ return R.ok().add(dto);
+ } catch (Exception e) {
+ log.error("/pakin2/loc/v1:======鎵樼洏鐮�:" + param.getBarcode() + "鐩樼偣鍥炲簱鏌ヨ宸ヤ綔妗ｅ嚭閿�======>" + e);
+ return R.error("鏌ョ湅wms==>info==>error");
+ }
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(locDetls) || locDetls.size() < 1) {
+ return R.error("鎵樼洏鐮�:" + param.getBarcode() + ",鏈煡鍒板簱瀛樻槑缁�");
+ } else {
+ if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())) {
+ return R.error("鏄庣粏宸茬粡琚慨鏀�,鏁呴殰");
+ }
+ }
+
+ Date now = new Date();
+ if (param.getIoType() == 107 || param.getIoType() == 103) {//鐩樼偣鍐嶅叆搴�
+ try {
+ // 妫�绱㈠簱浣�
+ try {
+ dto = commonService.getLocNo(1, 1, param.getSourceStaNo(), locDetls.get(0).getMatnr(), null, null, locTypeDto);
+ } catch (Exception e) {
+ log.error("鍫嗗灈鏈虹珯鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅嚭閿�:" + e.getMessage() + e);
+ throw new Exception("鏌ヨ搴撲綅鍑洪敊锛屽弬鏁帮細param.getSourceStaNo():" + param.getSourceStaNo() + "==>locDetls:" + locDetls + "==>locTypeDto:" + locTypeDto);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
+ if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())) {
+ throw new Exception("鐩爣搴撲綅locMast鏌ヨ涓虹┖||locMast.getLocSts涓虹┖");
+ } else {
+ if (!locMast.getLocSts().equals("O")) {
+ throw new Exception("鐩爣搴撲綅锛乴ocMast.getLocSts.equals(鈥淥鈥�)" + locMast.getLocSts());
+ } else {
+ locMast.setLocSts("Q");
+ locMast.setBarcode(param.getBarcode());
+ if (!locMastService.updateById(locMast)) {
+ log.error(" /pakin2/loc/v1 --- 淇敼搴撲綅鐘舵�佸け璐ワ紒" + locMast.getLocNo());
+ throw new Exception("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+ }
+ }
+ if (!locDetlService.updateLocNo(locMast.getLocNo(), wrkMast.getSourceLocNo())) {
+ log.error(" /pakin2/loc/v1 --- 搴撳瓨鏄庣粏杞Щ澶辫触锛�" + wrkMast.getWrkNo());
+ throw new Exception("搴撳瓨鏄庣粏杞Щ澶辫触");
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� O 绌哄簱浣�
+ LocMast locMast2 = locMastService.selectById(wrkMast.getSourceLocNo());
+ locMast2.setLocSts("O");
+ locMast2.setBarcode("");
+ locMast2.setModiTime(now);
+ if (!locMastService.updateById(locMast2)) {
+ log.error(" /pakin2/loc/v1 --- 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紒" + wrkMast.getSourceLocNo());
+ throw new Exception("淇敼婧愬簱浣嶇姸鎬佸け璐�");
+ }
+
+ try {
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
+ log.error(" stnToCrnStnPick2 --- 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐ワ紒" + wrkMast.getWrkNo());
+ }
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 107->57 103->53
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(param.getSourceStaNo()); // 婧愮珯
+ wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
+ wrkMast.setModiTime(now);
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setCrnNo(dto.getCrnNo());
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error(" stnToCrnStnPick --- 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐ワ紒" + wrkMast.getWrkNo());
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+ // 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
+ wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(), now);
+ } catch (Exception e) {
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸嚭閿�");
+ }
+ } catch (Exception e) {
+ log.error("/pakin2/loc/v1:======鎵樼洏鐮�:" + param.getBarcode() + "鐩樼偣鍥炲簱鍑洪敊======>" + e);
+ return R.error("鏌ョ湅wmsError");
+ }
+ } else {
+ return R.error();
+ }
+ log.info("/pakin2/loc/v1:" + dto + "======鎵樼洏鐮�:" + param.getBarcode());
+ return R.ok().add(dto);
+ }
+
@PostMapping("/auto/emptyIn/v1")
@ResponseBody
- public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
+ public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, null, null, locTypeDto);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -134,12 +291,12 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
- return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(){
+ public R autoEmptyOut() {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "D"));
if (Cools.isEmpty(locMast)) {
@@ -147,9 +304,11 @@
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
emptyPlateOutParam.setOutSite(12);
- emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
+ emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
+ add(locMast.getLocNo() + "");
+ }});
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
- return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+ return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
/**
@@ -160,8 +319,9 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
+ List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -197,6 +357,11 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ if (!Cools.isEmpty(waitPakin.getOrderNo())) {
+ Order order = orderService.selectByNo(waitPakin.getOrderNo());
+ wrkDetl.setSPgNO(order.getTemp2());
+
+ }
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -214,19 +379,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
@@ -236,7 +401,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -266,19 +431,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
--
Gitblit v1.9.1