From a7960f82ce5bddf52ea4f134169e739e120c5131 Mon Sep 17 00:00:00 2001 From: zwl <1051256694@qq.com> Date: 星期五, 03 二月 2023 19:57:06 +0800 Subject: [PATCH] 变更 --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +++--- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ++- src/main/java/com/zy/common/service/CommonService.java | 22 +++++++++++++++------- 3 files changed, 20 insertions(+), 11 deletions(-) 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 5e4a8a6..1d0e633 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -95,7 +95,8 @@ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())); // int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()) // .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )")); - if (countLoc > 0 || countWrk > 0) { + + if (countLoc > 0 || countWrk > 0) { throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode()); } diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 7b17868..162e683 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -211,9 +211,9 @@ Integer outSta = staNo.getDevNo(); //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷f枡绔欐寚瀹氫负202 - if(locMast.getCrnNo()==2){ - outSta = ioType == 101 ? 204 : 202; - } +// if(locMast.getCrnNo()==2){ +// outSta = ioType == 101 ? 204 : 202; +// } // 鑾峰彇璺緞 StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta); diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 58b105a..854ca6f 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -100,19 +100,27 @@ // whsType = getWhsType(sourceStaNo, times); StartupDto startupDto = new StartupDto(); - if (sourceStaNo < 200){ +// if (sourceStaNo < 200){ +// whsType = 1; +// } else if (sourceStaNo > 199 && sourceStaNo < 300){ +// whsType = 2; +// } else if (sourceStaNo > 299 && sourceStaNo < 400){ +// whsType = 3; +// } else if (sourceStaNo > 399){ +// whsType = 4; +// } + + if (sourceStaNo ==101||sourceStaNo==103){ whsType = 1; - } else if (sourceStaNo > 199 && sourceStaNo < 300){ + } else if (sourceStaNo ==105||sourceStaNo==107){ whsType = 2; - } else if (sourceStaNo > 299 && sourceStaNo < 400){ - whsType = 3; - } else if (sourceStaNo > 399){ - whsType = 4; + } else{ + throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); } RowLastno rowLastno = rowLastnoService.selectById(whsType); if (Cools.isEmpty(rowLastno)) { - throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); + throw new CoolException("1鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); } // ===============>>>> 寮�濮嬫墽琛� -- Gitblit v1.9.1