diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java index 39cfcd66..7b4c9d3e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java @@ -85,7 +85,7 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService { JSONObject o = (JSONObject)has.get(); String is_send = o.getString("is_send"); if("1".equals(is_send)){ - throw new PdaRequestException("该载具"+storagevehicle_code+"已发货,不允许再次发货!"); + throw new PdaRequestException("该载具"+storagevehicle_code+"已出库,不允许再次出库!"); } } //3、 通过托盘,查询【桶记录表】状态=入库,得到载具桶库存信息,无结果提示错误; @@ -132,7 +132,7 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService { JSONObject o = (JSONObject)any.get(); String is_send = o.getString("is_send"); if("1".equals(is_send)){ - throw new PdaRequestException("该载具"+storagevehicle_code+"已发货,不允许再次发货!"); + throw new PdaRequestException("该载具"+storagevehicle_code+"已出库,不允许再次出库!"); } } } @@ -141,6 +141,9 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService { Set set = new HashSet(); for(int i=0;i=2){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql index 1b1cc6c8..314ccd7c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql @@ -110,8 +110,8 @@ procedureoffline.pcsn, procedureoffline.qty, procedureoffline.bucketunique, - procedureoffline.storagevehicle_code - + procedureoffline.storagevehicle_code, + procedureoffline.is_send FROM pdm_bi_procedureoffline procedureoffline LEFT JOIN md_me_materialbase mb ON mb.material_id = procedureoffline.material_id