From 4b908ac5da01952c73944ae15a03fe066be71a49 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 28 Jun 2022 09:56:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql   | 6 +++++-
 mes/qd/src/utils/datetime.js                                | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
index 5ebbc984..511cacef 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
@@ -297,10 +297,13 @@
         IF 输入.flag = "7"
             QUERY
                 SELECT
-                    ProductMaterialSet.*
+                    ProductMaterialSet.*,
+                    classstandard.class_code
                 FROM
                     MD_PD_ProductMaterialSet ProductMaterialSet
                 LEFT JOIN md_me_producmaterialext producmaterialext ON producmaterialext.material_id = ProductMaterialSet.material_id
+                left join md_me_materialbase materialbase on materialbase.material_id = ProductMaterialSet.set_material_id
+                LEFT JOIN md_pb_classstandard classstandard ON classstandard.class_id = materialbase.material_type_id
                 WHERE
                     1 = 1
                     and producmaterialext.net_rate>0
@@ -313,6 +316,7 @@
                   OPTION 输入.set_type <> ""
                      ProductMaterialSet.set_type =  输入.set_type
                   ENDOPTION
+                  order by classstandard.class_code asc
                 ENDSELECT
             ENDQUERY
         ENDIF
diff --git a/mes/qd/src/utils/datetime.js b/mes/qd/src/utils/datetime.js
index 67f808ac..92feb0f3 100644
--- a/mes/qd/src/utils/datetime.js
+++ b/mes/qd/src/utils/datetime.js
@@ -19,6 +19,12 @@ Date.prototype.daysAgo = function(days, midnight) {
   return midnight ? date.toMidnight() : date
 }
 
+Date.prototype.daysLater = function(days, midnight) {
+  days = days ? days + 0 : 0
+  const date = new Date(this.getTime() + days * 8.64E7)
+  return midnight ? date.toMidnight() : date
+}
+
 Date.prototype.monthBegin = function(offset) {
   offset = offset ? offset - 0 : 0
   const days = this.getDate() - 1 - offset