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

优化

Browse Source
This commit is contained in:
zds
2022-12-05 21:12:56 +08:00
parent 8f14b98765
commit dd366c7322
10 changed files with 753 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.ext_id TYPEAS s_string
输入.material_id TYPEAS s_string
输入.pcsn TYPEAS s_string
@@ -138,3 +139,27 @@
ENDQUERY
ENDIF
IF 输入.flag = "6"
QUERY
SELECT
sum(PURCHASE.QTY_ZT) AS notqty,
sum(PURCHASE.QTY_HT) AS sumqty,
PURCHASE.VBILLCODE AS receive_code,
mater.material_code,
mater.material_name
FROM
PURCHASE_CONTRACT_VIEW PURCHASE
INNER JOIN md_me_materialbase mater ON PURCHASE.ITEM_ID = mater.ext_id
where
STATUSFLAG = '3'
AND DEL_FLAG = '0'
OPTION 输入.material_id <> ""
mater.material_id = 输入.material_id
ENDOPTION
GROUP BY PURCHASE.ITEM_ID,PURCHASE.VBILLCODE
ENDSELECT
ENDQUERY
ENDIF

31
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/StatisticalReportController.java
View File

@@ -68,4 +68,35 @@ public class StatisticalReportController {
return new ResponseEntity<>(statisticalReportService.getHeader2(), HttpStatus.OK);
}
@GetMapping("/query1")
@Log("查询月生产计划")
@ApiOperation("查询月生产计划")
public ResponseEntity<Object> query1(@RequestParam Map whereJson){
return new ResponseEntity<>(statisticalReportService.
query1(whereJson),HttpStatus.OK);
}
@GetMapping("/query2")
@Log("查询月生产计划")
@ApiOperation("查询月生产计划")
public ResponseEntity<Object> query2(@RequestParam Map whereJson){
return new ResponseEntity<>(statisticalReportService.
query2(whereJson),HttpStatus.OK);
}
@GetMapping("/query3")
@Log("查询月生产计划")
@ApiOperation("查询月生产计划")
public ResponseEntity<Object> query3(@RequestParam Map whereJson){
return new ResponseEntity<>(statisticalReportService.
query3(whereJson),HttpStatus.OK);
}
@GetMapping("/query4")
@Log("查询月生产计划")
@ApiOperation("查询月生产计划")
public ResponseEntity<Object> query4(@RequestParam Map whereJson){
return new ResponseEntity<>(statisticalReportService.
query4(whereJson),HttpStatus.OK);
}
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/StatisticalReportService.java
View File

@@ -33,4 +33,12 @@ public interface StatisticalReportService {
JSONArray getHeader();
JSONArray getHeader2();
JSONArray query1(Map whereJson);
JSONArray query2(Map whereJson);
JSONArray query3(Map whereJson);
JSONArray query4(Map whereJson);
}

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

@@ -396,4 +396,54 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
return jonsResuftArr;
}
@Override
public JSONArray query1(Map whereJson) {
HashMap<String, String> map = new HashMap<>(whereJson);
String material_id = map.get("material_id");
JSONArray ja = WQL.getWO("statistical_report_query_02")
.addParam("flag", "1")
.addParam("material_id", material_id)
.process().getResultJSONArray(0);
return ja;
}
@Override
public JSONArray query2(Map whereJson) {
HashMap<String, String> map = new HashMap<>(whereJson);
String material_id = map.get("material_id");
JSONArray ja = WQL.getWO("statistical_report_query_02")
.addParam("flag", "2")
.addParam("material_id", material_id)
.process().getResultJSONArray(0);
return ja;
}
@Override
public JSONArray query3(Map whereJson) {
HashMap<String, String> map = new HashMap<>(whereJson);
String material_id = map.get("material_id");
JSONArray ja = WQL.getWO("QL_ERP")
.setDbname("dataSource1")
.addParam("flag", "6")
.addParam("material_id", material_id)
.process().getResultJSONArray(0);
return ja;
}
@Override
public JSONArray query4(Map whereJson) {
HashMap<String, String> map = new HashMap<>(whereJson);
JSONArray ja = WQL.getWO("statistical_report_query_02")
.addParam("flag", "3")
.process().getResultJSONArray(0);
return ja;
}
}

134
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql Normal file
View File

@@ -0,0 +1,134 @@
[交易说明]
交易名： 压制性能分页查询
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.material_code TYPEAS s_string
输入.bill_code TYPEAS s_string
输入.io_type TYPEAS s_string
输入.buss_type TYPEAS s_string
输入.bill_type TYPEAS s_string
输入.stor_id TYPEAS s_string
输入.deptIds TYPEAS s_string
输入.create_mode TYPEAS s_string
输入.bill_status TYPEAS s_string
输入.material_id TYPEAS s_string
输入.org_id TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
QUERY
SELECT
structivt.material_id,
structivt.pcsn,
max( mater.material_code ) AS material_code,
max( mater.material_name ) AS material_name,
SUM( structivt.canuse_qty ) AS qty
FROM
st_ivt_structivt structivt
INNER JOIN md_me_materialbase mater ON structivt.material_id = mater.material_id
WHERE
structivt.quality_scode = '01'
OPTION 输入.material_id <> ""
structivt.material_id = 输入.material_id
ENDOPTION
GROUP BY structivt.material_id,structivt.pcsn
order by mater.material_code
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "2"
QUERY
SELECT
dtl.receive_qty - dtl.instor_qty AS noin_qty,
dtl.receive_qty,
mater.material_code,
mater.material_name,
dtl.pcsn,
dtl.receive_code,
dtl.material_id
FROM
PCS_RC_ReceiveDtl dtl
inner JOIN pcs_rc_receivemst mst ON mst.receive_id = dtl.receive_id
INNER JOIN md_me_materialbase mater ON dtl.material_id = mater.material_id
WHERE
mst.is_delete = '0'
AND mst.STATUS <> '99'
AND dtl.STATUS <> '99'
OPTION 输入.material_id <> ""
dtl.material_id = 输入.material_id
ENDOPTION
order by mater.material_code
ENDSELECT
ENDQUERY
ENDIF
IF 输入.flag = "3"
QUERY
SELECT DISTINCT
mb.material_id,
mb.material_name,
mb.material_code
FROM
(
SELECT
wo.material_id
FROM
pdm_bi_workorder wo
WHERE
wo.is_delete = '0'
AND wo.`status` IN ( '10', '20', '30' )
UNION
SELECT
plan.material_id
FROM
mps_bd_productdailyplan plan
WHERE
plan.`status` = '01'
) a
LEFT JOIN md_pd_productbom bom ON bom.material_id = a.material_id
LEFT JOIN md_pd_productbomdtl dtl ON dtl.bom_id = bom.bom_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
ORDER BY material_code
ENDSELECT
ENDQUERY
ENDIF