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

修改bug

Browse Source
This commit is contained in:
zds
2022-07-27 15:45:00 +08:00
parent 2106f84f9d
commit 9e60a2e1c6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
View File

@@ -107,7 +107,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
for(int i=0;i<pcsn_num;i++){ for(int i=0;i<pcsn_num;i++){
JSONObject jo = this.createPcsn(json); JSONObject jo = this.createPcsn(json);
pcsn = jo.getString("pcsn"); pcsn = jo.getString("pcsn");
JSONObject old = mstTab.query("status<>'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"'").uniqueResult(0); JSONObject old = mstTab.query("is_delete='0' and status<>'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"'").uniqueResult(0);
if(old!=null){ if(old!=null){
throw new BadRequestException("已存在相同产品和批次的未完成工令！"); throw new BadRequestException("已存在相同产品和批次的未完成工令！");
} }
@@ -146,7 +146,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
String material_id = whereJson.getString("material_id"); String material_id = whereJson.getString("material_id");
String pcsn = whereJson.getString("pcsn"); String pcsn = whereJson.getString("pcsn");
String workorder_id = whereJson.getString("workorder_id"); String workorder_id = whereJson.getString("workorder_id");
JSONObject old = mstTab.query("status<>'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"' and workorder_id<>'"+workorder_id+"'").uniqueResult(0); JSONObject old = mstTab.query("is_delete='0' and status<>'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"' and workorder_id<>'"+workorder_id+"'").uniqueResult(0);
if(old!=null){ if(old!=null){
throw new BadRequestException("已存在相同产品和批次的未完成工令！"); throw new BadRequestException("已存在相同产品和批次的未完成工令！");
} }