From 5b2a92ba86b8218da40a002f13f724fcff8cbe95 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期三, 01 六月 2022 17:02:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/WcsController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index ffe5095..de97aac 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -64,7 +64,7 @@ if (wrkMast != null && wrkMast.getIoType() == 103) { return R.parse(CodeRes.PICK_600); } - return R.error("鏉$爜鏁版嵁閿欒"); + 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())); @@ -78,6 +78,7 @@ // 婧愮珯鐐圭姸鎬佹娴� BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true); + sourceStaNo.setLocType1(param.getLocType1()); LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo); StartupDto dto = null; @@ -92,7 +93,7 @@ default: break; } - + log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode()); return R.ok().add(dto); } -- Gitblit v1.9.1