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-08-03 16:56:55 +08:00
parent 6090e1b6a6
commit 47723a23a5
5 changed files with 109 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
if (search.contains("\\")) {
search = search.replace("\\", "\\\\\\");
}
map.put("search", "%" + search + "%");
map.put("search", search + "%");
}
//处理物料当前节点的所有子节点

11
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
View File

@@ -44,7 +44,16 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
mb.*,
mb.material_id,
mb.material_code,
mb.material_name,
mb.material_spec,
mb.material_model,
mb.is_used,
mb.update_optname,
mb.update_time,
mb.base_unit_id,
mb.ass_unit_id,
class.class_code,
class.class_name,
unit_name,

69
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql
View File

@@ -43,6 +43,73 @@
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT
m.material_id,
m.material_code,
m.material_name,
m.base_unit_id,
m.material_type_id,
s.is_need_plan,
s.standard_weight AS stock_standard_weight,
s.is_report AS stock_is_report,
s.wc_seqno,
s.report_seqno,
s.is_pure,
s.is_need_move AS stock_is_need_move,
p.old_mark,
p.product_mode,
p.is_auto_open,
p.waste_limit_down,
p.waste_limit_up,
p.report_time,
p.is_report AS produc_is_report,
p.is_again_put,
p.standard_weight AS produc_standard_weight,
p.product_series,
p.c_balance,
p.ball_time,
p.ball_speed,
p.weight_lost_up,
p.weight_lost_down,
p.product_ball_time,
p.standard_weight_pft,
p.is_need_move AS product_is_need_move,
p.net_rate,
p.technology_code,
p.ball_rate,
p.liquid_rate,
m.is_used,
m.update_optname,
m.update_time,
m.material_height_type,
b.class_name,
b.class_code,
u.unit_name
FROM
md_me_materialbase m
LEFT JOIN md_me_stockmaterialext s ON m.material_id = s.material_id
LEFT JOIN md_me_producmaterialext p ON m.material_id = p.material_id
LEFT JOIN md_pb_classstandard b ON m.material_type_id = b.class_id
LEFT JOIN md_pb_measureunit u ON u.measure_unit_id = m.base_unit_id
WHERE
m.is_delete = '0'
OPTION 输入.material_code <> ""
( m.material_code like "%" 输入.material_code "%" or m.material_name like "%" 输入.material_code "%")
ENDOPTION
OPTION 输入.classIds <> ""
b.class_id in 输入.classIds
ENDOPTION
OPTION 输入.class_code <> ""
b.class_code like 输入.class_code
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "3"
PAGEQUERY
SELECT
m.material_id,
@@ -97,6 +164,7 @@
LEFT JOIN md_me_stockmaterialext s ON m.material_id = s.material_id
LEFT JOIN md_me_producmaterialext p ON m.material_id = p.material_id
LEFT JOIN md_pb_classstandard b ON m.material_type_id = b.class_id
LEFT JOIN sys_dict_detail d1 ON d1.value = p.product_mode and d1.name = 'product_mode'
LEFT JOIN sys_dict_detail d2 ON d2.value = s.is_need_plan and d2.name = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d3 ON d3.value = s.is_report and d3.name = 'IS_OR_NOT'
@@ -104,6 +172,7 @@
LEFT JOIN sys_dict_detail d4 ON d4.value = p.is_auto_open and d4.name = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d5 ON d5.value = p.is_again_put and d5.name = 'IS_OR_NOT'
LEFT JOIN sys_dict_detail d6 ON d6.value = p.product_series and d6.name = 'product_series'
LEFT JOIN md_pb_measureunit u ON u.measure_unit_id = m.base_unit_id
WHERE
m.is_delete = '0'

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

@@ -69,7 +69,7 @@
(dtl.receive_qty - dtl.instor_qty) AS surplus_qty,
SUBSTR(proc.vbillcode,1,6) AS order_code_1,
SUBSTR(proc.vbillcode,8,10) AS order_code_2,
sheetDtl.source_bill_id AS is_no
sheetMst.inspection_id AS is_no
FROM
PCS_RC_ReceiveDtl dtl
LEFT JOIN pcs_rc_receivemst mst ON mst.receive_id = dtl.receive_id
@@ -77,7 +77,8 @@
LEFT JOIN PCS_IF_PurchaseOrderProc proc ON proc.id = dtl.source_billdtl_id
LEFT JOIN MD_CS_SUPPLIERBASE supp ON proc.vend_id = supp.ext_id
LEFT JOIN MD_ME_StockMaterialExt ext ON mater.material_id = ext.material_id
LEFT JOIN QL_TEST_InspectionSheetDtl sheetDtl ON dtl.receivedtl_id = sheetDtl.source_bill_id
LEFT JOIN QL_TEST_InspectionSheetDtl sheetDtl ON dtl.material_id = sheetDtl.material_id AND dtl.pcsn = sheetDtl.pcsn
LEFT JOIN QL_TEST_InspectionSheetMst sheetMst ON sheetMst.inspection_id = sheetDtl.inspection_id and sheetMst.is_delete = '0'
WHERE
mst.is_delete = '0'