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

优化

Browse Source
This commit is contained in:
zds
2022-11-17 15:55:39 +08:00
parent 7c2fe0ea60
commit 8a55b97e05
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
View File

@@ -345,6 +345,10 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
bill_type = "000601"; bill_type = "000601";
break; break;
} }
JSONObject jo_now = WQL.getWO("QPADST_IN_SERVICE").addParam("flag", "11").addParam("storagevehicle_code", storagevehicle_code).process().uniqueResult(0);
if(jo_now!=null){
throw new PdaRequestException("该载具"+storagevehicle_code+"已存在未完成的入库单！");
}
JSONObject mst_jo = new JSONObject(); JSONObject mst_jo = new JSONObject();
String bill_code = CodeUtil.getNewCode("IO_CODE"); String bill_code = CodeUtil.getNewCode("IO_CODE");
mst_jo.put("iostorinv_id", iostorinv_id); mst_jo.put("iostorinv_id", iostorinv_id);

16
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/wql/QPADST_IN_SERVICE.wql
View File

@@ -63,6 +63,22 @@
ENDQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "11"
QUERY
SELECT
IOStorInvDisDtl.*
FROM
ST_IVT_IOStorInvDisDtl IOStorInvDisDtl
LEFT JOIN st_ivt_iostorinvdtl iostorinvdtl ON iostorinvdtl.iostorinvdtl_id = IOStorInvDisDtl.iostorinvdtl_id
LEFT JOIN st_ivt_iostorinv iostorinv ON iostorinv.iostorinv_id = IOStorInvDisDtl.iostorinv_id
WHERE
iostorinvdtl.bill_status<>'99'
and iostorinv.is_delete<>'1'
and IOStorInvDisDtl.storagevehicle_code = 输入.storagevehicle_code
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "2" IF 输入.flag = "2"
QUERY QUERY
SELECT SELECT

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java
View File

@@ -547,6 +547,9 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService
if (jsonIvt.getDoubleValue("canuse_qty") != jsonIvt.getDoubleValue("ivt_qty")) { if (jsonIvt.getDoubleValue("canuse_qty") != jsonIvt.getDoubleValue("ivt_qty")) {
throw new BadRequestException("此批次物料有未完成的单据"); throw new BadRequestException("此批次物料有未完成的单据");
} }
if (jsonDtl.getString("result").equals(jsonIvt.getString("quality_scode"))) {
continue;
}
JSONObject prarm = new JSONObject(); JSONObject prarm = new JSONObject();
String change_type_scode = ""; String change_type_scode = "";
prarm.put("struct_id", jsonIvt.getString("struct_id")); prarm.put("struct_id", jsonIvt.getString("struct_id"));