SRM-LAYUI-HK.git

			@@ -166,7 +166,7 @@
			, element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块

			var option;
			FetchSupInfo();
			//FetchSupInfo();
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -181,9 +181,10 @@
			, { field: 'HMaterNumber', title: '物料编码', width: 120 }
			/* , { field: 'HOldMaterNumber', title: '旧物料编码', width: 120, hide: true }*/
			, { field: 'HMaterShortNumber', title: '物料代码', width: 120, hide: true }
			, { field: 'HSubjoin', title: '物料简称', width: 120, }
			, { field: 'HSubjoin', title: '物料简称', width: 120, }
			, { field: 'HMaterName', title: '物料名称', width: 120 }
			, { field: 'HMaterModel', title: '规格型号', width: 120 }
			, { field: 'HStatusMan', title: '工号', width: 120, edit: 'text' }
			, { field: 'HQty', title: '本次生成条码数量', width: 135, edit: 'text', event: "inputHQty" }
			, { field: 'HMinQty', title: '标准包装数（内箱装箱数）', width: 100, event: "inputHMinQty" }
			, { field: 'HBQty', title: '最小包装数（内箱数）', width: 100 }
			@@ -192,8 +193,9 @@
			, { field: 'HBatchManager', title: '启用批号', width: 100, hide: true }
			, { field: 'HISKFPERIOD', title: '是否启用保质期', width: 100, edit: 'text', hide: true }
			, { field: 'HEXPUNIT', title: '保质期单位', width: 100, edit: 'text', hide: true }
			, { field: 'HSourceBillType', title: '条码类型', width: 100, templet: '#barCodeTypeTpl' }
			, { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
			, { field: 'HSourceBillType', title: '条码类型', width: 100, templet: '#barCodeTypeTpl', hide: true }
			, { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }//, event: "chooseHKFDate"
			, { field: 'HBarCodeDate', title: '条码日期', align: 'center', width: 150, data_field: 'HBarCodeDate', event: "chooseHBarCodeDate" }
			, { field: 'HKFPeriod', title: '保质期', width: 100, event: "inputHKFPeriod", hide: true }//
			, { field: 'HKFDQDate', title: '到期日期', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true }//, event: "chooseHKFDQDate"
			, { field: 'HSupID', title: '供应商ID', width: 150, hide: true }
			@@ -235,6 +237,7 @@
			, { field: 'HSubjoin', title: '物料代码', width: 120, hide: true }
			, { field: 'HMaterName', title: '物料名称', width: 120 }
			, { field: 'HMaterModel', title: '规格型号', width: 120 }
			, { field: 'HStatusMan', title: '工号', width: 120, edit: 'text'}
			, { field: 'HQty', title: '本次生成条码数量', width: 135, edit: 'text', event: "inputHQty" }
			, { field: 'HMinQty', title: '标准包装数（内箱装箱数）', width: 100, event: "inputHMinQty" }
			, { field: 'HBQty', title: '最小包装数（内箱数）', width: 100 }
			@@ -243,7 +246,8 @@
			, { field: 'HBatchManager', title: '启用批号', width: 100, hide: true }
			, { field: 'HISKFPERIOD', title: '是否启用保质期', width: 100, edit: 'text', hide: true }
			, { field: 'HEXPUNIT', title: '保质期单位', width: 100, edit: 'text', hide: true }
			, { field: 'HSourceBillType', title: '条码类型', width: 100 }
			, { field: 'HBarCodeDate', title: '条码日期', align: 'center', width: 150, data_field: 'HBarCodeDate', event: "chooseHBarCodeDate" }
			, { field: 'HSourceBillType', title: '条码类型', width: 100, hide: true }
			, { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }//, event: "chooseHKFDate"
			, { field: 'HKFPeriod', title: '保质期', width: 100, hide: true }//
			, { field: 'HKFDQDate', title: '到期日期', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true}//, event: "chooseHKFDQDate"
			@@ -271,6 +275,10 @@
			var data = data.data;
			var rowdata = [];

			$("#HSupID").val(data[0].HSupID);
			$("#HSupNumber").val(data[0].供应商代码);
			$("#HSupName").val(data[0].供应商名称);

			for (var i = 0; i < data.length; i++) {
			rowdata.push({
			"HMaterID": data[i].MaterID,
			@@ -293,7 +301,8 @@
			"HSupID": data[i].HSupID,
			"HSupName": data[i].供应商名称,
			"HEXPUNIT": data[i].保质期单位,
			"HQty": 1, // 默认生成条码数量
			"HQty": 0, // 默认生成条码数量
			"HBarCodeDate": data[i].条码日期,
			"biaoqianzhangshu": 1 // 标签张数
			});
			}
			@@ -392,6 +401,18 @@
			data[field] = value;
			obj.update(data);

			}
			});
			}
			else if (obj.event == 'chooseHBarCodeDate') {
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //直接显示
			, closeStop: this
			, done: function (value, date) {
			data[field] = value;
			obj.update(data);
			}
			});
			}
			@@ -522,7 +543,7 @@

			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sMainSub = sMainStr + ';' + sSubStr;
			var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"];
			var _sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i < _sSubStr.length; i++) {
			if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HMinQty == 0 \|\| _sSubStr[i].HWXQty == 0)) {
			@@ -535,6 +556,12 @@
			// layer.msg("明细记录第" + (i + 1) + "行,本次生成条码数量不能超出未生成条码数量!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
			// return Result = false;
			//}

			if (_sSubStr[i].HQty == 0) {
			layer.msg("明细记录第" + (i + 1) + "行,生成条码数量不能为0!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
			return Result = false;
			}

			if (_sSubStr[i].HQty > 0 && _sSubStr[i].HISKFPERIOD == 1 && (/_sSubStr[i].HBatchNo == "" \|\|/ _sSubStr[i].HKFDate == "")) {
			layer.msg("明细记录第" + (i + 1) + "行,生产日期不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
			return Result = false;
			@@ -594,28 +621,31 @@
			, defaultToolbar: ['filter', 'exports']
			, limit: 500
			, cols: [[
			{ field: 'HBarCode', title: '条码', width: 230, ellipsis: true }
			{ field: 'HLSH', title: '流水号', align: 'center', width: 150, data_field: 'HBarCodeDate' }
			, { field: 'HBarCode', title: '条码', width: 230, ellipsis: true }
			, { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
			, { field: 'HBarItemID', title: '条码ID', width: 100, hide: true }
			, { field: 'HMaterNumber', title: '物料编码', width: 120 }
			/* , { field: 'LSH', title: '流水号', width: 120 }*/
			/* , { field: 'LSH', title: '流水号', width: 120 }*/
			/* , { field: 'HOldMaterNumber', title: '旧物料编码', width: 120, hide: true }*/
			, { field: 'HMaterShortNumber', title: '物料代码', width: 120 }
			, { field: 'HSubjoin', title: '物料简称', width: 120, hide: true }
			, { field: 'HMaterShortNumber', title: '物料代码', width: 120, hide: true }
			, { field: 'HSubjoin', title: '物料简称', width: 120 }
			, { field: 'HMaterName', title: '物料名称', width: 120, hide: true }
			, { field: 'HMaterModel', title: '规格型号', width: 120 }
			, { field: 'HStatusMan', title: '工号', width: 120 }
			, { field: 'HQty', title: '本次生成条码数量', width: 135 }
			, { field: 'HMinQty', title: '标准包装数（内箱装箱数）', width: 100 }
			, { field: 'HBQty', title: '最小包装数（内箱数）', width: 100 }
			, { field: 'biaoqianzhangshu', title: '标签张数', width: 100 }
			, { field: 'HBatchNo', title: '批号', width: 100 }
			, { field: 'HBarCodeDate', title: '条码日期', align: 'center', width: 150, data_field: 'HBarCodeDate' }
			, { field: 'HBatchNo', title: '批号', width: 100, hide: true }
			, { field: 'HBatchManager', title: '启用批号', width: 100, hide: true }
			, { field: 'HISKFPERIOD', title: '是否启用保质期', width: 100, hide: true }
			, { field: 'HEXPUNIT', title: '保质期单位', width: 100, hide: true }
			, { field: 'HSourceBillType', title: '条码类型', width: 100 }
			, { field: 'HKFDate', title: '生产日期', align: 'center', width: 150 }//, event: "chooseHKFDate"
			, { field: 'HKFPeriod', title: '保质期', width: 100 }//
			, { field: 'HKFDQDate', title: '到期日期', align: 'center', width: 150 }//, event: "chooseHKFDQDate"
			, { field: 'HSourceBillType', title: '条码类型', width: 100, hide: true }
			, { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, hide: true }//, event: "chooseHKFDate"
			, { field: 'HKFPeriod', title: '保质期', width: 100, hide: true }//
			, { field: 'HKFDQDate', title: '到期日期', align: 'center', width: 150, hide: true }//, event: "chooseHKFDQDate"
			, { field: 'HSupID', title: '供应商ID', width: 150, hide: true }
			, { field: 'HSupName', title: '供应商名称', width: 150, hide: true }

			@@ -637,35 +667,38 @@
			var rowdata_1 = [];

			for (var i = 0; i < data.length; i++) {

			rowdata_1.push({
			"HMaterID": data[i].HMaterID,
			"HBarItemID": data[i].HBarItemID,
			/* "LSH": data[i].HBarItemID,*/
			"HBarCode": data[i].HBarCode,
			"HMaterNumber": data[i].物料代码,
			"HMaterShortNumber": "",
			"HSubjoin": data[i].物料简称,
			"HMaterName": data[i].物料名称,
			"HMaterModel": data[i].规格型号,
			"HMinQty": data[i].标准包装数,
			"HBQty": data[i].最小包装数,
			"HSourceBillType": data[i].条码类型,
			"HBatchNo": data[i].批号,
			"HISKFPERIOD": data[i].是否启用保质期 == null ? 0 : data[i].是否启用保质期,
			"HKFPeriod": data[i].保质期 == null ? 0 : data[i].保质期,
			"HKFDQDate": data[i].有效期,
			"HKFDate": data[i].生产日期,
			"HBatchManager": data[i].是否启用批号,
			"HSupID": data[i].HSupID,
			"HSupName": data[i].供应商名称,
			"HEXPUNIT": data[i].保质期单位,
			"HQty":data[i].生成条码数量 , // 本次生成条码数量
			"biaoqianzhangshu": 1
			});




			rowdata_1.push({
			"HMaterID": data[i].HMaterID,
			"HBarItemID": data[i].HBarItemID,
			/* "LSH": data[i].HBarItemID,*/
			"HBarCode": data[i].HBarCode,
			"HMaterNumber": data[i].物料代码,
			"HMaterShortNumber": "",
			"HSubjoin": data[i].物料简称,
			"HMaterName": data[i].物料名称,
			"HMaterModel": data[i].规格型号,
			"HMinQty": data[i].标准包装数,
			"HBQty": data[i].最小包装数,
			"HSourceBillType": data[i].条码类型,
			"HBatchNo": data[i].批号,
			"HISKFPERIOD": data[i].是否启用保质期 == null ? 0 : data[i].是否启用保质期,
			"HKFPeriod": data[i].保质期 == null ? 0 : data[i].保质期,
			"HKFDQDate": data[i].有效期,
			"HKFDate": data[i].生产日期,
			"HBatchManager": data[i].是否启用批号,
			"HSupID": data[i].HSupID,
			"HSupName": data[i].供应商名称,
			"HEXPUNIT": data[i].保质期单位,
			"HQty": data[i].生成条码数量, // 本次生成条码数量
			"biaoqianzhangshu": 1,
			"HStatusMan": data[i].工号,
			"HBarCodeDate": data[i].条码日期,
			"HLSH": data[i].流水号,
			});



			}

			// 更新表格数据
			@@ -675,104 +708,19 @@
			}
			});
			//#endregion

			// #region 成功条码展示
			//$.ajax({
			// type: "GET",
			// url: GetWEBURL() + "/showHBarCodeBillDetail",
			// async: true,
			// data: { sMsg: lentryid, user: sessionStorage["Organization"] },
			// dataType: "json",
			// success: function (data_1) {
			// if (data_1.count != 0) {
			// var data = data_1.data;
			// var rowdata_1 = [];
			// var IDdif = data[0].HItemID;
			// for (var i = 0,k=1; i < data.length; i++,k++) {
			// var totalQty = data[i].生成条码数量; // 总条码数
			// var standardQty = data[i].标准包装数; // 标准包装数
			// var labelCount = Math.ceil(totalQty / standardQty); // 计算标签数
			// var lastQty_sign = (totalQty % standardQty == 0) ? 0 : 1;//判断是否有余数

			// if (k == labelCount && lastQty_sign==1) {
			// rowdata_1.push({
			// "HMaterID": data[i].HItemID,
			// "HBarCode": data[i].HBarCode,
			// "HMaterNumber": data[i].物料代码,
			// "HMaterShortNumber": "",
			// "HMaterName": data[i].物料名称,
			// "HMaterModel": data[i].规格型号,
			// "HMinQty": standardQty ,
			// "HBQty": data[i].最小包装数,
			// "HSourceBillType": data[i].条码类型,
			// "HBatchNo": data[i].批号,
			// "HISKFPERIOD": data[i].是否启用保质期 == null ? 0 : data[i].是否启用保质期,
			// "HKFPeriod": data[i].保质期 == null ? 0 : data[i].保质期,
			// "HKFDQDate": data[i].有效期,
			// "HKFDate": data[i].生产日期,
			// "HBatchManager": data[i].是否启用批号,
			// "HSupID": data[i].供应商代码,
			// "HSupName": data[i].供应商名称,
			// "HEXPUNIT": data[i].保质期单位,
			// "HQty": (totalQty % standardQty), // 本次生成条码数量
			// "biaoqianzhangshu": 1
			// });
			// k = 1;
			// }
			// else {
			// rowdata_1.push({
			// "HMaterID": data[i].HItemID,
			// "HBarCode": data[i].HBarCode,
			// "HMaterNumber": data[i].物料代码,
			// "HMaterShortNumber": "",
			// "HMaterName": data[i].物料名称,
			// "HMaterModel": data[i].规格型号,
			// "HMinQty": standardQty,
			// "HBQty": data[i].最小包装数,
			// "HSourceBillType": data[i].条码类型,
			// "HBatchNo": data[i].批号,
			// "HISKFPERIOD": data[i].是否启用保质期 == null ? 0 : data[i].是否启用保质期,
			// "HKFPeriod": data[i].保质期 == null ? 0 : data[i].保质期,
			// "HKFDQDate": data[i].有效期,
			// "HKFDate": data[i].生产日期,
			// "HBatchManager": data[i].是否启用批号,
			// "HSupID": data[i].供应商代码,
			// "HSupName": data[i].供应商名称,
			// "HEXPUNIT": data[i].保质期单位,
			// "HQty": standardQty, // 本次生成条码数量
			// "biaoqianzhangshu": 1
			// });
			// }

			} else {
			layer.msg(data.Message);
			}



			// }

			// option_Success.data = rowdata_1;
			// table.render(option_Success);

			// }
			// else {
			// // $("#verifycode").click();
			// f_alert(data.Message);
			// }
			// layer.closeAll("loading");
			// },
			// error: function (err) {
			// f_alert("错误:" + err);
			// layer.closeAll("loading");
			// }
			//});
			// #endregion
			}

			layer.closeAll("loading");
			},
			error: function (err) {
			f_alert("错误:" + err);
			}
			});
			return false;
			layer.closeAll("loading");
			},
			error: function (err) {
			f_alert("错误:" + err);
			}
			});
			return false;
			});
			//#endregion

			@@ -833,7 +781,7 @@
			//获取供应商ID
			function FetchSupInfo() {
			var sWhere = "";
			//var sWhere = " and 供应商名称 ='" + sessionStorage["HUserName"] + "'";
			var sWhere = " and 供应商名称 ='" + sessionStorage["HUserName"] + "'";
			$.ajax({
			url: GetWEBURL() + "/Gy_Supplier/list",
			type: "GET",