From c3f90af33300eb54fe704060068a32a84aac0737 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 03 八月 2023 10:25:02 +0800
Subject: [PATCH] 到期日期比生产日期早一天，询价单，报价单，excel生成送货单
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 86 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index da7d880..e2027d3 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -25,7 +25,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -276,10 +276,10 @@
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'FPrintCount', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
- , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text' , event: "inputHQty"}
+ , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text', event: "inputHQty" }
, { field: 'HRQty', title: '鍙彂璐ф暟閲�', width: 100 }
, { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 120,edit: 'text',}
+ , { field: 'HBatchNo', title: '鎵规', width: 120, edit: 'text', }
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
@@ -296,8 +296,10 @@
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 100, hide: true }
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true }
- , { field: 'HExpressSupplierSub', title: '鐗╂祦鍏徃', width: 200, edit: true }
+ , { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true }//鐟炵惇
+ , { field: 'HExpressSupplierSub', title: '鐗╂祦鍏徃', width: 200, edit: true }//鐟炵惇
+ , { field: 'HPlanArrivalDate', title: '鍒拌揣鏃ユ湡', width: 200, data_field: 'HPlanArrivalDate', event: "PlanArrivalDate" }//鐟炵惇
+ , { field: 'HBoxNumber', title: '绠卞彿', width: 200, edit: true }//鐟炵惇
, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
]]
@@ -385,7 +387,8 @@
, "HSourceEntryID": data[i].HSourceEntryID
, "FSHDD": data[i].FSHDD
, "F_xbkf_Combo": data[i].F_xbkf_Combo
- }
+ , "HPlanArrivalDate": data[i].HPlanArrivalDate
+ }
//oldData.push(data1);
oldData.splice(dataindex, 0, data1);
};
@@ -470,6 +473,20 @@
});
}
+ else if (obj.event === 'PlanArrivalDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (value, date) {
+ data[field] = value;
+ obj.update(data);
+
+ }
+ });
+
+ }
else if (obj.event == 'inputHQty') {
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
@@ -524,18 +541,25 @@
async: true,
data: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType },
success: function (result) {
- ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , loading: false
- , done: function (index, res) {
- layer.closeAll("loading");
- }
- });
+ if (result.count == 10000) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+ layer.closeAll("loading");
+ }
+ });
+ } else {
+ layer.closeAll("loading");
+ layer.msg(result.Message, { icon: 2, time: 4000 });
+ }
+
},
error: function (result) {
console.log(result);
+ layer.closeAll("loading");
//layer.msg('鑾峰彇濮斿璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
}
});
@@ -544,7 +568,7 @@
//debugger;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr;
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
@@ -671,35 +695,35 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鏁伴噺涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- //鐟炵惇娌℃湁杩欓」鎺у埗
- if (sSubStr[i].FPrintCount == 0) {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,娌℃湁杩涜鏉＄爜鎵撳嵃锛屼笉鑳界敓鎴愰�佽揣鍗�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ ////鐟炵惇娌℃湁杩欓」鎺у埗
+ //if (sSubStr[i].FPrintCount == 0) {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,娌℃湁杩涜鏉＄爜鎵撳嵃锛屼笉鑳界敓鎴愰�佽揣鍗�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
//if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- //閫佽揣鏁伴噺
+ //閫佽揣鏁伴噺
if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HRQty)) {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧彲鍙戣揣鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- ////閫佽揣鏁伴噺
- if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囨墦鍗版潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //////閫佽揣鏁伴噺
+ //if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囨墦鍗版潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉＄爜鏁伴噺 鏃堕檺鍒�
//if (parseFloat(sSubStr[i].HQty) + parseFloat(sSubStr[i].HSQty) - parseFloat(sSubStr[i].HRQty) > parseFloat(sSubStr[i].FPrintCount)) {
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- if (sSubStr[i].HBatchNo == "") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if (sSubStr[i].HBatchNo == "") {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
}
}
else {
--
Gitblit v1.9.1