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

add:新增粉料计划

Browse Source
This commit is contained in:
zhangzq
2024-04-19 13:50:31 +08:00
parent 7d79fd22da
commit cd42f6cc4e
9 changed files with 1188 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,9 +200,25 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc
map.put("material_code", "%" + material_code + "%");
}
String vbillcode = MapUtil.getStr(whereJson, "vbillcode");
String proc_status = MapUtil.getStr(whereJson, "proc_status");
String contract_no = MapUtil.getStr(whereJson, "contract_no");
String supp_name = MapUtil.getStr(whereJson, "supp_name");
String iszero = MapUtil.getStr(whereJson, "iszero");
if (!ObjectUtil.isEmpty(vbillcode)) {
map.put("vbillcode", "%" + vbillcode + "%");
}
if (!ObjectUtil.isEmpty(proc_status)) {
map.put("proc_status", proc_status);
}
if (!ObjectUtil.isEmpty(contract_no)) {
map.put("contract_no", "%" + contract_no + "%");
}
if (!ObjectUtil.isEmpty(supp_name)) {
map.put("supp_name", "%" + supp_name + "%");
}
if (!ObjectUtil.isEmpty(iszero)) {
map.put("iszero", "true".equals(iszero)?"= 0":"<> 0");
}
String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.ZLFL.getClass_idStr());
map.put("classIds",classIds);

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

@@ -18,7 +18,12 @@
输入.end_time TYPEAS s_string
输入.material_code TYPEAS s_string
输入.vbillcode TYPEAS s_string
输入.proc_status TYPEAS s_string
输入.contract_no TYPEAS s_string
输入.supp_name TYPEAS s_string
输入.classIds TYPEAS f_string
输入.vbillcodes TYPEAS f_string
输入.iszero TYPEAS f_string
[临时表]
@@ -129,6 +134,7 @@
SELECT
oder.id,
oder.contract_no,
oder.proc_status,
supp.supp_name,
mater.material_name,
mater.material_code,
@@ -180,6 +186,21 @@
oder.vbillcode like 输入.vbillcode
ENDOPTION
OPTION 输入.supp_name <> ""
supp.supp_name like 输入.supp_name
ENDOPTION
OPTION 输入.contract_no <> ""
oder.contract_no like 输入.contract_no
ENDOPTION
OPTION 输入.proc_status <> ""
oder.proc_status = 输入.proc_status
ENDOPTION
OPTION 输入.iszero <> ""
(oder.QTY - redtl.allqty) 输入.iszero
ENDOPTION
OPTION 输入.classIds <> ""
mater.material_type_id in 输入.classIds
ENDOPTION
@@ -196,7 +217,7 @@
IF 输入.flag = "2"
PAGEQUERY
SELECT
oder.vbillcode,
oder.contract_no,
dtl.receive_code,
mater.material_code,
mater.material_name,
@@ -222,5 +243,87 @@
ENDPAGEQUERY
ENDIF
IF 输入.flag = "12"
PAGEQUERY
SELECT
oder.vbillcode,
oder.contract_no,
mater.material_name,
mater.material_code,
oder.PRICE_TAX,
oder.QTY,
oder.QTY * oder.PRICE_TAX AS money,
oder.remark
FROM
PCS_IF_PurchaseOrderProc oder
LEFT JOIN md_me_materialbase mater ON oder.ITEM_ID = mater.ext_id
WHERE
oder.dr = '0'
OPTION 输入.begin_time <> ""
oder.CREATE_DATE >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
oder.CREATE_DATE <= 输入.end_time
ENDOPTION
OPTION 输入.vbillcode <> ""
oder.vbillcode like 输入.vbillcode
ENDOPTION
OPTION 输入.classIds <> ""
mater.material_type_id in 输入.classIds
ENDOPTION
OPTION 输入.material_code <> ""
(mater.material_code like 输入.material_code or
mater.material_name like 输入.material_code )
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "13"
PAGEQUERY
SELECT
oder.vbillcode,
dtl.receive_code,
oder.QTY - redtl.allqty AS notqty,
redtl.allqty,
redtl.allqty * oder.PRICE_TAX AS all_valmoney,
LEFT(remst.input_time,10) as input_time,
dtl.receive_qty,
dtl.receive_qty * oder.PRICE_TAX AS valmoney,
supp.supp_name,
supp.honour_days,
DATE_ADD(LEFT(remst.input_time,10),INTERVAL supp.honour_days DAY) AS plan_date
FROM
PCS_IF_PurchaseOrderProc oder
LEFT JOIN md_cs_supplierbase supp ON oder.VEND_ID = supp.ext_id
LEFT JOIN PCS_RC_ReceiveDtl dtl ON dtl.source_billdtl_id = oder.id AND dtl.source_bill_code = oder.vbillcode
LEFT JOIN (
SELECT
sum( a.receive_qty ) AS allqty,
max(a.source_billdtl_id) AS source_billdtl_id,
max( a.material_id ) AS material_id,
max( a.pcsn ) AS pcsn,
max( a.receive_id ) AS receive_id
FROM
PCS_RC_ReceiveDtl a
LEFT JOIN PCS_IF_PurchaseOrderProc p ON a.source_billdtl_id = p.id AND a.source_bill_code = p.vbillcode
GROUP BY
a.source_billdtl_id
)
AS redtl ON redtl.source_billdtl_id = dtl.source_billdtl_id
LEFT JOIN PCS_RC_ReceiveMst remst ON remst.receive_id = dtl.receive_id
WHERE 1=1
OPTION 输入.vbillcodes <> ""
oder.vbillcode in 输入.vbillcodes
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

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

Binary file not shown.

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
View File

@@ -248,7 +248,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
jo10.put("first", "覆盖日期（含待检）");
rows.add(jo10);
JSONObject jo11 = new JSONObject();
jo11.put("first", "后续需求量");
jo11.put("first", "后续10天需求量");
rows.add(jo11);
JSONObject jo6 = new JSONObject();
jo6.put("first", "合同在途");