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

fix:入库明细单查询sql:出入库单明细表兼容00,01状态

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-27 11:23:21 +08:00
parent 2001d52197
commit 0d221fab2b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,11 +647,11 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService
continue; continue;
} }
// 如果是合格或者是放行就存入 入库数 // 如果是合格或者是放行就存入 入库数
if (StrUtil.equals(jsonDtl.getString("result"), "01") || StrUtil.equals(jsonDtl.getString("result"), "03")) { if (StrUtil.equals(jsonDtl.getString("result"), "02")) {
jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty"));
// 如果是不合格就将入库数清0
} else if (StrUtil.equals(jsonDtl.getString("result"), "02")) {
jsonReDtl.put("instor_qty", 0); jsonReDtl.put("instor_qty", 0);
// 如果是不合格就将入库数清0
} else {
jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty"));
} }
//判断到货明细表中的数量与到货入库数是否相等，相同就完成，不相等就到货中 //判断到货明细表中的数量与到货入库数是否相等，相同就完成，不相等就到货中
if (jsonReDtl.getDoubleValue("receive_qty") <= jsonReDtl.getDoubleValue("instor_qty")) { if (jsonReDtl.getDoubleValue("receive_qty") <= jsonReDtl.getDoubleValue("instor_qty")) {
@@ -824,11 +824,11 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService
JSONObject json = ivtDtlArr.getJSONObject(j); JSONObject json = ivtDtlArr.getJSONObject(j);
JSONObject jsonReDtl = reDtlTab.query("receivedtl_id = '" + json.getString("source_billdtl_id") + "'").uniqueResult(0); JSONObject jsonReDtl = reDtlTab.query("receivedtl_id = '" + json.getString("source_billdtl_id") + "'").uniqueResult(0);
// 如果是合格或者是放行就存入 入库数 // 如果是合格或者是放行就存入 入库数
if (StrUtil.equals(jsonDtl.getString("result"), "01") || StrUtil.equals(jsonDtl.getString("result"), "03")) { if (StrUtil.equals(jsonDtl.getString("result"), "02")) {
jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty"));
// 如果是不合格就将入库数清0
} else if (StrUtil.equals(jsonDtl.getString("result"), "02")) {
jsonReDtl.put("instor_qty", 0); jsonReDtl.put("instor_qty", 0);
// 如果是不合格就将入库数清0
} else {
jsonReDtl.put("instor_qty", json.getDoubleValue("real_qty"));
} }
//判断到货明细表中的数量与到货入库数是否相等，相同就完成，不相等就到货中 //判断到货明细表中的数量与到货入库数是否相等，相同就完成，不相等就到货中
if (jsonReDtl.getDoubleValue("receive_qty") <= jsonReDtl.getDoubleValue("instor_qty")) { if (jsonReDtl.getDoubleValue("receive_qty") <= jsonReDtl.getDoubleValue("instor_qty")) {

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql
View File

@@ -76,7 +76,7 @@
LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
WHERE WHERE
mst.is_delete = '0' mst.is_delete = '0'
AND dtl.quality_scode = '00' AND dtl.quality_scode in ('00','01')
AND dtl.material_id = 输入.material_id AND dtl.material_id = 输入.material_id
AND dtl.pcsn = 输入.pcsn AND dtl.pcsn = 输入.pcsn
AND dtl.source_bill_type = '81' AND dtl.source_bill_type = '81'