From e497b2a0cdda6f8eb298aeaf336011bad44ef98e Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 9 Nov 2022 16:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/StatisticalReportServiceImpl.java | 20 +++++++++----------
.../wql/statistical_report_query_01.wql | 20 +++++++++++++++++++
.../views/wms/pdm/produce/dailyplan/index.vue | 2 +-
.../views/wms/pdm/produce/mouthtask/index.vue | 2 +-
.../views/wms/pdm/produce/workorder/index.vue | 1 -
5 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
index 0e26106c..626b202a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
@@ -40,7 +40,9 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
map.put("pcsn", MapUtil.getStr(whereJson, "pcsn"));
if (!StrUtil.isEmpty(material_code)) {
//处理转义字符
- if (material_code.contains("\\")) material_code = material_code.replace("\\", "\\\\\\");
+ if (material_code.contains("\\")) {
+ material_code = material_code.replace("\\", "\\\\\\");
+ }
map.put("material_code", "%" + material_code + "%");
}
@@ -149,26 +151,22 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
//3、待检入库量：sum(此物料未确认的到货单的单据数-入库数)
JSONObject num_jo = WQL.getWO("statistical_report_query_01").addParam("flag", "7").addParam("material_id", material_id).process().uniqueResult(0);
- //订单数量
- double proc_qty = 0;
- //到货重量
- double allqty = 0;
+
+ //3、待检入库量：sum(此物料未确认的到货单的单据数-入库数)
+ JSONObject noin_jo = WQL.getWO("statistical_report_query_01").addParam("flag", "77").addParam("material_id", material_id).process().uniqueResult(0);
//合同在途
double notqty = 0;
- //待检重量
- double noqty = 0;
//待检+未入库数量
double noin_qty = 0;
if (ObjectUtil.isNotEmpty(num_jo)) {
- proc_qty = num_jo.getDoubleValue("qty");
- allqty = num_jo.getDoubleValue("allqty");
notqty = num_jo.getDoubleValue("notqty");
- noqty = num_jo.getDoubleValue("noqty");
- noin_qty = num_jo.getDoubleValue("noin_qty");
if (notqty < 0) {
notqty = 0;
}
}
+ if (ObjectUtil.isNotEmpty(noin_jo)) {
+ noin_qty = noin_jo.getDoubleValue("noin_qty");
+ }
jo4.put(material_id, String.format("%.3f", noin_qty));
//4、合同在途：订单量-到货量
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql
index dad46f98..70ce19b6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_01.wql
@@ -417,6 +417,26 @@
ENDQUERY
ENDIF
+ IF 输入.flag = "77"
+ QUERY
+ SELECT
+ sum( a.receive_qty - a.instor_qty ) AS noin_qty,
+ a.material_id
+ FROM
+ PCS_RC_ReceiveDtl a
+ LEFT JOIN pcs_rc_receivemst mst ON mst.receive_id = a.receive_id
+ WHERE
+ mst.is_delete = '0'
+ AND mst.STATUS <> '99'
+ AND a.STATUS <> '99'
+ OPTION 输入.material_id <> ""
+ a.material_id = 输入.material_id
+ ENDOPTION
+ GROUP BY a.material_id
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
IF 输入.flag = "8"
QUERY
SELECT
diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
index ea1bf54c..e1e02930 100644
--- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
@@ -105,7 +105,7 @@
diff --git a/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue b/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue
index d210c6cc..ffb6c494 100644
--- a/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue
@@ -130,7 +130,7 @@
v-model="query.nowstart_date"
type="date"
style="width: 200px"
- value-format=“yyyy-MM-dd”
+ value-format="yyyy-MM-dd"
placeholder="选择日期">
启用
diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
index 90fa7c7d..756fc189 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -372,7 +372,6 @@ export default {
this.Depts = res
})
this.crud.query.createTime = [new Date(), new Date().daysLater(2)]
- //this.crud.toQuery()
},
methods: {
canUd(row) {