From 258fb5fa6e99490a9e667b4e7d49f48c29ce2c9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 15 四月 2024 10:24:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 257 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index adfff62..3dcec0e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -51,6 +51,8 @@
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ private StaDescService staDescService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -102,6 +104,203 @@
// case 201://鑷姩琛ョ┖鏉夸换鍔�
// dto = emptyPlateIn201(param.getSourceStaNo(), locTypeDto, param.getBarcode());
// break;
+ default:
+ break;
+ }
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ return R.ok().add(dto);
+ }
+
+ @PostMapping("/pakin2/loc/v1")
+ @ResponseBody
+ @Transactional
+ public synchronized R getLocNo2(@RequestBody SearchLocParam 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("/pakin/empty/loc/v1")
+ @ResponseBody
+ public synchronized R getLocNoEmpty(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ List<WaitPakin> waitPakins = null;
+ if (param.getIoType() == 1) {
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+ waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(waitPakins)) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() == 103) {
+ return R.parse(CodeRes.PICK_600);
+ }
+ 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()));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error(CodeRes.EXIST_500);
+ }
+ }
+ if (Cools.isEmpty(param.getLocType1())){
+ return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
+ }
+
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1((short)1);
+
+ StartupDto dto = null;
+ switch (param.getIoType()) {
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateInEmpty(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ break;
default:
break;
}
@@ -218,12 +417,12 @@
if (!waitPakinService.update(setParam, wrapper)) {
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
- 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")){
@@ -270,6 +469,58 @@
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+// // 鏇存柊婧愮珯鐐逛俊鎭�
+// sourceStaNo.setWrkNo(workNo);
+// sourceStaNo.setModiTime(new Date());
+// if (!basDevpService.updateById(sourceStaNo)){
+// throw new CoolException("鏇存柊婧愮珯澶辫触");
+// }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ return dto;
+ }
+
+ @Transactional
+ public StartupDto emptyPlateInEmpty(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatusEmpty(devpNo, true);
+ // 妫�绱㈠簱浣�
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
+ int workNo = dto.getWorkNo();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setBarcode(barcode);
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiTime(new Date());
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
--
Gitblit v1.9.1