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

opt:优化出入库单管理查询页面

Browse Source
This commit is contained in:
zhangzq
2024-04-01 20:14:47 +08:00
parent 7d82ab6a53
commit af449f7ba1
3 changed files with 110 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
View File

@@ -90,27 +90,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (StrUtil.isNotEmpty(map.get("io_type"))) {
map.put("io_type", map.get("io_type"));
}
if (StrUtil.isNotEmpty(map.get("is_upload"))) {
map.put("is_upload", map.get("is_upload"));
}
if (StrUtil.isNotEmpty(map.get("pcsn"))) {
map.put("pcsn", "%" + map.get("pcsn") + "%");
}
if (StrUtil.isNotEmpty(map.get("material_code"))) {
map.put("material_code", "%" + map.get("material_code") + "%");
}
map.put("flag", "12");
JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc");
JSONArray json = jo.getJSONArray("content");
map.put("flag", "01");
JSONArray jo2 = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).process().getResultJSONArray(1);
if(jo2.size()!=0){
JSONObject jo3 = jo2.getJSONObject(0);
jo3.put("bill_code","合计");
json.add(jo3);
}else{
JSONObject jo3 = new JSONObject();
jo3.put("stor_name","合计");
json.add(jo3);
}
jo.put("content",json);
return jo;
}

82
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -29,6 +29,7 @@
输入.material_code TYPEAS s_string
输入.quality_scode TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.is_upload TYPEAS s_string
输入.ivt_level TYPEAS s_string
输入.is_active TYPEAS s_string
输入.sect_id TYPEAS s_string
@@ -670,6 +671,87 @@
ENDQUERY
ENDIF
IF 输入.flag = "12"
PAGEQUERY
SELECT
supp.supp_name,
mst.iostorinv_id,
mst.bill_code,
mst.buss_type,
mst.io_type,
mst.bill_type,
mst.bill_status,
mst.stor_name,
mst.biz_date,
create_mode,
material_code,
material_name,
dtl.pcsn,
plan_qty,
assign_qty,
unassign_qty,
quality_scode,
ivt_level,
is_active,
dtl.qty_unit_name,
IF(is_upload='0','否','是') as is_upload,
mst.upload_time,sys_user.nick_name as input_optname,mst.input_time,mst.confirm_time
FROM
st_ivt_iostorinvdtl dtl
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id
LEFT JOIN sys_user on mst.input_optid = sys_user.user_id
left join md_me_materialbase mb on dtl.material_id=mb.material_id
left join PCS_RC_ReceiveDtl on dtl.material_id=PCS_RC_ReceiveDtl.material_id and dtl.pcsn = PCS_RC_ReceiveDtl.pcsn
LEFT JOIN PCS_IF_PurchaseOrderProc proc ON proc.id = PCS_RC_ReceiveDtl.source_billdtl_id
LEFT JOIN MD_CS_SUPPLIERBASE supp ON proc.vend_id = supp.ext_id
where 1=1
and mst.is_delete='0'
OPTION 输入.bill_code <> ""
mst.bill_code like 输入.bill_code
ENDOPTION
OPTION 输入.io_type <> ""
mst.io_type = 输入.io_type
ENDOPTION
OPTION 输入.buss_type <> ""
mst.buss_type like 输入.buss_type
ENDOPTION
OPTION 输入.bill_type <> ""
mst.bill_type = 输入.bill_type
ENDOPTION
OPTION 输入.stor_id <> ""
mst.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.deptIds <> ""
mst.sysdeptid in 输入.deptIds
ENDOPTION
OPTION 输入.create_mode <> ""
mst.create_mode = 输入.create_mode
ENDOPTION
OPTION 输入.is_upload <> ""
mst.is_upload = 输入.is_upload
ENDOPTION
OPTION 输入.quality_scode <> ""
dtl.quality_scode = 输入.quality_scode
ENDOPTION
OPTION 输入.pcsn <> ""
dtl.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.material_code <> ""
(mb.material_code like 输入.material_code or mb.material_name like 输入.material_code)
ENDOPTION
OPTION 输入.bill_status <> ""
mst.bill_status = 输入.bill_status
ENDOPTION
OPTION 输入.begin_time <> ""
mst.input_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
mst.input_time <= 输入.end_time
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF