From b28acfba24adf4f1d2b567d0e2d99c29bd8c6d03 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 六月 2024 13:50:53 +0800
Subject: [PATCH] 1
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index f8cbeb4..fe8a934 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -154,25 +154,26 @@
//璁＄畻鏈夋晥鏈熻嚦
if (HExpUnit == "Y") {//骞�
date = new Date(date);
- console.log(date.getFullYear(date));
date.setYear(date.getFullYear(date) + HKFPeriod);
- console.log(Format(date, "yyyy-MM-dd"));
+ date.setDate(date.getDate(date) - 1);
return Format(date, "yyyy-MM-dd");
}
if (HExpUnit == "M") {//鏈�
date = new Date(date);
date.setMonth(date.getMonth(date) + HKFPeriod);
+ date.setDate(date.getDate(date) - 1);
return Format(date, "yyyy-MM-dd");
}
if (HExpUnit == "D") {//鏃�
date = new Date(date);
date.setDate(date.getDate(date) + HKFPeriod);
- console.log(Format(date, "yyyy-MM-dd"));
+ date.setDate(date.getDate(date) - 1);
+
return Format(date, "yyyy-MM-dd");
}
- else { //瀹夌憺璁＄畻鏂瑰紡
+ else { //瀹夌憺璁＄畻鏂瑰紡
if (days == undefined || days == '') {
days = 1;
}
@@ -459,7 +460,7 @@
}
//鑾峰彇涓嬫爣
index = findIndex(_sSubStr[i].HMaterNumber, _sSubStr[i].HMaterModel, newArray);
- if (index === -1) {
+ if (index === -1 || _sSubStr[i].HIsSplit == 0) {
//濡傛灉鏁扮粍涓病鏈夊綋鍓嶆暟鎹紝鍒欏皢鏁版嵁娣诲姞杩涙暟缁勪腑
newArray.push(_sSubStr[i]);
@@ -467,7 +468,7 @@
if (newArray[index].HPOOrderBillNo == _sSubStr[i].HPOOrderBillNo) {
//濡傛灉鏁扮粍涓湁鍜屽綋鍓嶆暟鎹腑鐗╂枡浠ｇ爜銆佽鏍煎瀷鍙蜂竴鑷寸殑淇℃伅锛屽垯灏嗕粬浠殑鏁伴噺绱姞
newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
- }
+ }
}
}
@@ -701,6 +702,7 @@
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
, { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
+ , { field: 'HIsSplit', title: '鏄惁鎷嗗垎', width: 150, hide: true } //0鍚︼紝1鏄�
]]
, done: function (res, curr, count) {
@@ -789,9 +791,11 @@
, "HSupName": data[i].HSupName
, "HSupBatchNo": data[i].HSupBatchNo
, "HSupMaterNumber": data[i].HSupMaterNumber
+ , "HEXPUNIT": data[i].HEXPUNIT
+ , "HIsSplit": 1
}
- //oldData.push(data1);
- oldData.splice(dataindex, 0, data1);
+ oldData.push(data1);
+ //oldData.splice(dataindex, 0, data1);
};
break;
}
--
Gitblit v1.9.1