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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-19 10:59:38 +08:00
parent 5eb80080b1
commit c0c859b323
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC01.wql
View File

@@ -60,7 +60,7 @@
unit.unit_name, unit.unit_name,
SUBSTR(oder.vbillcode,1,6) AS order_code_1, SUBSTR(oder.vbillcode,1,6) AS order_code_1,
SUBSTR(oder.vbillcode,8,10) AS order_code_2, SUBSTR(oder.vbillcode,8,10) AS order_code_2,
( oder.qty - dtl.instor_qty ) AS surplus_qty ( oder.qty - dtl.receive_qty ) AS surplus_qty
FROM FROM
PCS_IF_PurchaseOrderProc oder PCS_IF_PurchaseOrderProc oder
LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id
@@ -82,7 +82,7 @@
LEFT JOIN PCS_RC_ReceiveMst mst ON mst.receive_id = dtl.receive_id AND mst.is_delete = '0' LEFT JOIN PCS_RC_ReceiveMst mst ON mst.receive_id = dtl.receive_id AND mst.is_delete = '0'
LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID
WHERE WHERE
1=1 oder.dr = '0'
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
oder.CREATE_DATE >= 输入.begin_time oder.CREATE_DATE >= 输入.begin_time
ENDOPTION ENDOPTION
@@ -122,7 +122,7 @@
unit.unit_name, unit.unit_name,
SUBSTR(oder.vbillcode,1,6) AS order_code_1, SUBSTR(oder.vbillcode,1,6) AS order_code_1,
SUBSTR(oder.vbillcode,8,10) AS order_code_2, SUBSTR(oder.vbillcode,8,10) AS order_code_2,
( oder.qty - dtl.instor_qty ) AS surplus_qty ( oder.qty - dtl.receive_qty ) AS surplus_qty
FROM FROM
PCS_IF_PurchaseOrderProc oder PCS_IF_PurchaseOrderProc oder
LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id LEFT JOIN MD_CS_SUPPLIERBASE supp ON oder.VEND_ID = supp.ext_id
@@ -144,7 +144,7 @@
LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID LEFT JOIN md_pb_measureunit unit ON unit.ext_id = oder.M_UNIT_ID
LEFT JOIN ST_IVT_IOStorInv ivtmst ON ivtmst.iostorinv_id = dtl.iostorinv_id AND ivtmst.bill_type = '000202' LEFT JOIN ST_IVT_IOStorInv ivtmst ON ivtmst.iostorinv_id = dtl.iostorinv_id AND ivtmst.bill_type = '000202'
WHERE WHERE
1=1 oder.dr = '0'
OPTION 输入.type_id <> "" OPTION 输入.type_id <> ""
mater.material_type_id in 输入.type_id mater.material_type_id in 输入.type_id

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java
View File

@@ -466,8 +466,8 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
if (StrUtil.equals(json.getString("material_type"), "01")) { if (StrUtil.equals(json.getString("material_type"), "01")) {
// 物料：查物料表关联分类表 // 物料：查物料表关联分类表
JSONObject jsonDtlMater = materTab.query("material_id = '" + json.getString("material_id") + "'").uniqueResult(0); JSONObject jsonDtlMater = materTab.query("material_id = '" + json.getString("material_id") + "'").uniqueResult(0);
JSONObject jsonDtlClass = classTab.query("class_id = '" + jsonDtlMater.getString("material_type_id") + "'").uniqueResult(0); // JSONObject jsonDtlClass = classTab.query("class_id = '" + jsonDtlMater.getString("material_type_id") + "'").uniqueResult(0);
class_name = jsonDtlClass.getString("class_name"); class_name = jsonDtlMater.getString("material_name");
} else { } else {
// 分类：直接用明细表的物料标识查基础分类表 // 分类：直接用明细表的物料标识查基础分类表
JSONObject jsonDtlClass = classTab.query("class_id = '" + json.getString("material_id") + "'").uniqueResult(0); JSONObject jsonDtlClass = classTab.query("class_id = '" + json.getString("material_id") + "'").uniqueResult(0);