From 32a3f2e420ec416157a7c72602e877db547aa933 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 4 Jun 2024 16:29:14 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=90=88=E5=90=8C=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java | 1 - .../java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql | 2 +- mes/qd/src/views/wms/statistics/ledgerQuery/index.vue | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java index 2ea97796..cf80972d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java @@ -233,7 +233,6 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc .collect(Collectors.joining("','")); // 查询erp视图 - List ja = WQL.getWO("QERP").setDbname("dataSource1").addParam("flag", "8").addParam("no_ids", "('"+no_ids+"')").process().getResultJSONArray(0).toJavaList(JSONObject.class); for (int i = 0; i < content.size(); i++) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql index f13b8bbd..f7be0e67 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/QPCS_IF_PURCHASEORDERPROC02.wql @@ -197,7 +197,7 @@ oder.proc_status = 输入.proc_status ENDOPTION OPTION 输入.iszero <> "" - (oder.QTY - redtl.allqty) 输入.iszero + (IFNULL(oder.QTY - redtl.allqty,0)) 输入.iszero ENDOPTION diff --git a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue index aa9666ad..592fe5e3 100644 --- a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue @@ -19,7 +19,7 @@ size="mini" v-model="query.createTime" type="daterange" - value-format="yyyy-M-dd HH:mm:ss" + value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"