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

mdf:历史开单添加组织过滤

Browse Source
This commit is contained in:
zhangzhiqiang
2023-01-16 17:05:04 +08:00
parent 9f21f291b0
commit d39e1d42a6
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,6 +260,7 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
JSONArray dtlJa2 = WQL.getWO("statistical_report_query_02").addParam("flag", "4") JSONArray dtlJa2 = WQL.getWO("statistical_report_query_02").addParam("flag", "4")
.addParam("begin_time", begin_time) .addParam("begin_time", begin_time)
.addParam("end_time", end_time) .addParam("end_time", end_time)
.addParam("org_ids",org_ids_new)
.process() .process()
.getResultJSONArray(0); .getResultJSONArray(0);
for (int i = 0; i < dtlJa2.size(); i++) { for (int i = 0; i < dtlJa2.size(); i++) {
@@ -339,17 +340,17 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
//JSONObject num_jo = null; //JSONObject num_jo = null;
JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0); // JSONObject num_jo = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").process().uniqueResult(0);
//合同在途 //合同在途
double notqty = 0; double notqty = 0;
if (ObjectUtil.isNotEmpty(num_jo)) { // if (ObjectUtil.isNotEmpty(num_jo)) {
notqty = num_jo.getDoubleValue("notqty"); // notqty = num_jo.getDoubleValue("notqty");
if (notqty < 0) { // if (notqty < 0) {
notqty = 0; // notqty = 0;
} // }
} // }
jo6.put(material_id, String.format("%.2f", notqty)); jo6.put(material_id, String.format("%.2f", notqty));
//5、库/需差额量 ：库存现存量-排产需求量 //5、库/需差额量 ：库存现存量-排产需求量

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

@@ -35,6 +35,7 @@
输入.send_name TYPEAS s_string 输入.send_name TYPEAS s_string
输入.is_send0 TYPEAS s_string 输入.is_send0 TYPEAS s_string
输入.is_send12 TYPEAS s_string 输入.is_send12 TYPEAS s_string
输入.org_ids TYPEAS f_string
[临时表] [临时表]
@@ -177,6 +178,7 @@
SUM( FormulaDtl.formula_qty ) AS qty SUM( FormulaDtl.formula_qty ) AS qty
FROM PDM_BI_Formula Formula FROM PDM_BI_Formula Formula
inner JOIN PDM_BI_FormulaDtl FormulaDtl ON FormulaDtl.formula_id = Formula.formula_id inner JOIN PDM_BI_FormulaDtl FormulaDtl ON FormulaDtl.formula_id = Formula.formula_id
left JOIN pdm_bi_workorder ON Formula.workorder_code = pdm_bi_workorder.workorder_code
where 1=1 where 1=1
and Formula.is_delete='0' and Formula.is_delete='0'
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
@@ -184,6 +186,9 @@
ENDOPTION ENDOPTION
OPTION 输入.end_time <> "" OPTION 输入.end_time <> ""
Formula.create_time <= 输入.end_time Formula.create_time <= 输入.end_time
ENDOPTION
OPTION 输入.org_ids <> ""
pdm_bi_workorder.org_id in 输入.org_ids
ENDOPTION ENDOPTION
GROUP BY GROUP BY
FormulaDtl.material_id FormulaDtl.material_id

2
mes/qd/src/views/wms/pdm/produce/workorder/index.vue
View File

@@ -265,7 +265,7 @@
<el-table-column prop="bill_qty" min-width="90" label="开单总重量" :formatter="crud.formatNum3" /> <el-table-column prop="bill_qty" min-width="90" label="开单总重量" :formatter="crud.formatNum3" />
<el-table-column prop="productin_qty" min-width="90" label="实投总重量" :formatter="crud.formatNum3" /> <el-table-column prop="productin_qty" min-width="90" label="实投总重量" :formatter="crud.formatNum3" />
<el-table-column prop="qty_unit_name" min-width="75" label="单位" /> <el-table-column prop="qty_unit_name" min-width="75" label="单位" />
<el-table-column prop="planstart_time" min-width="100" label="计划开始时间" :formatter="workorder_dateFormat" /> <!-- <el-table-column prop="planstart_time" min-width="100" label="计划开始时间" :formatter="workorder_dateFormat" />-->
<el-table-column prop="planend_time" min-width="100" label="计划结束时间" :formatter="planend_timeFormat" /> <el-table-column prop="planend_time" min-width="100" label="计划结束时间" :formatter="planend_timeFormat" />
<el-table-column prop="realstart_time" min-width="135" label="实际开始时间" /> <el-table-column prop="realstart_time" min-width="135" label="实际开始时间" />
<el-table-column prop="realend_time" min-width="135" label="实际结束时间" /> <el-table-column prop="realend_time" min-width="135" label="实际结束时间" />