From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期三, 20 十二月 2023 12:55:25 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) 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 34ec9c5..667a7a1 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -217,9 +217,12 @@ } Integer outSta = staNo.getDevNo(); - //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷f枡绔欐寚瀹氫负202 + //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负103 if(locMast.getCrnNo()==2){ - outSta = ioType == 101 ? 204 : 202; + outSta = 103; + //鍑哄簱绔欑偣涓�205锛� + }else if(staNo.getDevNo()==205){ + } // 鑾峰彇璺緞 @@ -522,8 +525,8 @@ // }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) { // throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�"); }else if(sourceLoc.getPackStatus()!=3){ - if(sourceLoc.getLocType1()!=loc.getLocType1()){ - throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�"); + if(sourceLoc.getLocType1()==loc.getLocType1()){ + throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬬浉鍚�"); } } Date now = new Date(); -- Gitblit v1.9.1