From 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3 Mon Sep 17 00:00:00 2001 From: TQS <56479841@qq.com> Date: 星期六, 03 十二月 2022 13:12:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 6df1451..f7bfdc8 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -192,9 +192,9 @@ throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鏃犳湁鏁堝伐浣滄。"); }else if (wrkMast.getIoType()!=107){ throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。闈炵洏鐐逛换鍔�"); - }/*else if (barcode.getWrkSts()!=17){ + }else if (wrkMast.getWrkSts()!=17.0){ throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。宸ヤ綔鐘舵�佷笉鏄嚭搴撳畬鎴�"); - }*/else { } + }else { } List<WrkDetl> wrkDetls = param.getWrkDetls(); String recordRecordLog="鎵樼洏鐮�"+param.getBarcode()+"鐩樼偣璁板綍锛�"; @@ -212,7 +212,7 @@ WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>() .eq("wrk_no", wrkMast.getWrkNo()) .eq("matnr",wrkDetl.getMatnr()) - .eq("batch",wrkDetl.getBatch()) +// .eq("batch",wrkDetl.getBatch()) ); adjDetl.setMatnr(wrkDetl.getMatnr()); adjDetl.setBatch(wrkDetl.getBatch()); -- Gitblit v1.9.1