Merge remote-tracking branch 'origin/ytflWms' into ytflWms

Junjie

8 天以前 c501000155be318c8c56f06c60b764d42d14612b

Merge remote-tracking branch 'origin/ytflWms' into ytflWms

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -629,9 +629,7 @@
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                if ("Y".equals(param.getTkFlag())) {
                    waitPakin.setTkFlag(detlDto.getTkFlag());
                }
                waitPakin.setTkFlag(param.getTkFlag());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }