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-06-28 09:56:47 +08:00
parent adf3bdb086
commit 4b908ac5da
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPF_AUTOFORMULA01.wql
View File

@@ -297,10 +297,13 @@
IF 输入.flag = "7" IF 输入.flag = "7"
QUERY QUERY
SELECT SELECT
ProductMaterialSet.* ProductMaterialSet.*,
classstandard.class_code
FROM FROM
MD_PD_ProductMaterialSet ProductMaterialSet MD_PD_ProductMaterialSet ProductMaterialSet
LEFT JOIN md_me_producmaterialext producmaterialext ON producmaterialext.material_id = ProductMaterialSet.material_id 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 WHERE
1 = 1 1 = 1
and producmaterialext.net_rate>0 and producmaterialext.net_rate>0
@@ -313,6 +316,7 @@
OPTION 输入.set_type <> "" OPTION 输入.set_type <> ""
ProductMaterialSet.set_type = 输入.set_type ProductMaterialSet.set_type = 输入.set_type
ENDOPTION ENDOPTION
order by classstandard.class_code asc
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

6
mes/qd/src/utils/datetime.js
View File

@@ -19,6 +19,12 @@ Date.prototype.daysAgo = function(days, midnight) {
return midnight ? date.toMidnight() : date 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) { Date.prototype.monthBegin = function(offset) {
offset = offset ? offset - 0 : 0 offset = offset ? offset - 0 : 0
const days = this.getDate() - 1 - offset const days = this.getDate() - 1 - offset