root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/b_lms' into master_merge

Browse Source
This commit is contained in:
zhouz
2024-07-03 07:47:38 +08:00
parent 3ea9af5e29 78703b146d
commit 85c6e2cf49
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/SerfaceServiceImpl.java
View File

@@ -33,9 +33,9 @@ public class SerfaceServiceImpl implements SerfaceService {
if (ObjectUtil.isEmpty(raw_jo)) { if (ObjectUtil.isEmpty(raw_jo)) {
throw new BadRequestException("未查询到该母卷号对应的生箔工单！"); throw new BadRequestException("未查询到该母卷号对应的生箔工单！");
} }
if (raw_jo.getString("order_type").equals("2")) { /*if (raw_jo.getString("order_type").equals("2")) {
throw new BadRequestException("当前工单为锂电工单，不允许表处！"); throw new BadRequestException("当前工单为锂电工单，不允许表处！");
} }*/
JSONObject device_jo = WQLObject.getWQLObject("st_ivt_stpointivt").query("point_code = '" + device_code + "'").uniqueResult(0); JSONObject device_jo = WQLObject.getWQLObject("st_ivt_stpointivt").query("point_code = '" + device_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(device_jo)){ if (ObjectUtil.isEmpty(device_jo)){
throw new BadRequestException("未查询到设备号为["+device_code+"]的表处设备！"); throw new BadRequestException("未查询到设备号为["+device_code+"]的表处设备！");