diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java index 6b8f8b2a..38252799 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java @@ -107,7 +107,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService { for(int i=0;i'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){ throw new BadRequestException("已存在相同产品和批次的未完成工令!"); } @@ -146,7 +146,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService { String material_id = whereJson.getString("material_id"); String pcsn = whereJson.getString("pcsn"); 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){ throw new BadRequestException("已存在相同产品和批次的未完成工令!"); }