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

add:型材出库添加强制出库功能

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-22 23:22:53 +08:00
parent f473d92db6
commit 3199f5afa9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java
View File

@@ -85,7 +85,7 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService {
JSONObject o = (JSONObject)has.get(); JSONObject o = (JSONObject)has.get();
String is_send = o.getString("is_send"); String is_send = o.getString("is_send");
if("1".equals(is_send)){ if("1".equals(is_send)){
throw new PdaRequestException("该载具"+storagevehicle_code+"已发货，不允许再次发货!"); throw new PdaRequestException("该载具"+storagevehicle_code+"已出库，不允许再次出库!");
} }
} }
//3、 通过托盘，查询【桶记录表】状态=入库，得到载具桶库存信息，无结果提示错误； //3、 通过托盘，查询【桶记录表】状态=入库，得到载具桶库存信息，无结果提示错误；
@@ -132,7 +132,7 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService {
JSONObject o = (JSONObject)any.get(); JSONObject o = (JSONObject)any.get();
String is_send = o.getString("is_send"); String is_send = o.getString("is_send");
if("1".equals(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(); Set set = new HashSet();
for(int i=0;i<dtls.size();i++){ for(int i=0;i<dtls.size();i++){
JSONObject dtl = dtls.getJSONObject(i); JSONObject dtl = dtls.getJSONObject(i);
if("1".equals(dtl.getString("is_send"))){
throw new PdaRequestException("工令对应载具"+dtl.getString("storagevehicle_code")+"已出库，不允许再次出库!");
}
set.add(dtl.getString("material_id")); set.add(dtl.getString("material_id"));
} }
if(set.size()>=2){ if(set.size()>=2){

4
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/wql/QPADST_OUT_SERVICE2.wql
View File

@@ -110,8 +110,8 @@
procedureoffline.pcsn, procedureoffline.pcsn,
procedureoffline.qty, procedureoffline.qty,
procedureoffline.bucketunique, procedureoffline.bucketunique,
procedureoffline.storagevehicle_code procedureoffline.storagevehicle_code,
procedureoffline.is_send
FROM FROM
pdm_bi_procedureoffline procedureoffline pdm_bi_procedureoffline procedureoffline
LEFT JOIN md_me_materialbase mb ON mb.material_id = procedureoffline.material_id LEFT JOIN md_me_materialbase mb ON mb.material_id = procedureoffline.material_id