SRM-LAYUI-HK.git

			@@ -40,9 +40,9 @@
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label"> 供应商：</label>
			<label class="layui-form-label"> 供应商代码：</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
			<input class="layui-input" name="HSupNumber" lay-verify="HSupNumber" id="HSupNumber" readonly="readonly" autocomplete="off">
			<input id="HSupID" name="HSupID" type="hidden" />
			</div>
			</div>
			@@ -50,9 +50,9 @@
			<label class="layui-form-label"> 供应商：</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
			<input id="HSupName" name="HSupName" type="hidden" />
			</div>
			</div>
			</div>
			</div>

			</div>
			@@ -64,11 +64,11 @@
			<div class="layui-tab-item layui-show">
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>拆分</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn"><i class="layui-icon layui-icon-addition"></i>列设置</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>删行</button>
			</div>
			</div>-->
			</script>
			<!-- 条码类型下拉框模板 -->
			<script type="text/html" id="barCodeTypeTpl">
			@@ -288,7 +288,7 @@
			"HKFDQDate": data[i].有效期,
			"HKFDate": data[i].生产日期,
			"HBatchManager": data[i].是否启用批号,
			"HSupID": data[i].供应商代码,
			"HSupID": data[i].HSupID,
			"HSupName": data[i].供应商名称,
			"HEXPUNIT": data[i].保质期单位,
			"HQty": 1, // 默认生成条码数量
			@@ -592,8 +592,9 @@
			, defaultToolbar: ['filter', 'exports']
			, limit: 500
			, cols: [[
			, { field: 'HBarCode', title: '条码', width: 100 }
			{ 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: 'HOldMaterNumber', title: '旧物料编码', width: 120, hide: true }*/
			, { field: 'HMaterShortNumber', title: '物料代码', width: 120, hide: true }
			@@ -621,11 +622,11 @@
			var barcodes = data.data;

			// 将条码列表转换为逗号分隔的字符串
			var barcodeStr = barcodes.join(',');
			//var barcodeStr = barcodes.join('~');
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/GetBarcodeDetails",
			data: { barcodes: barcodeStr },
			data: { barcodes: barcodes },
			dataType: "json",
			success: function (data_1) {
			if (data_1.count != 0) {
			@@ -633,10 +634,10 @@
			var rowdata_1 = [];

			for (var i = 0; i < data.length; i++) {
			if (i == data.length - 1)//最后一条
			{

			rowdata_1.push({
			"HMaterID": data[i].HItemID,
			"HBarItemID": data[i].HBarItemID,
			"HBarCode": data[i].HBarCode,
			"HMaterNumber": data[i].物料代码,
			"HMaterShortNumber": "",
			@@ -651,37 +652,14 @@
			"HKFDQDate": data[i].有效期,
			"HKFDate": data[i].生产日期,
			"HBatchManager": data[i].是否启用批号,
			"HSupID": data[i].供应商代码,
			"HSupID": data[i].HSupID,
			"HSupName": data[i].供应商名称,
			"HEXPUNIT": data[i].保质期单位,
			"HQty": (data[i].生成条码数量 % data[i].标准包装数 == 0 ? data[i].标准包装数: (data[i].生成条码数量 % data[i].标准包装数)), // 本次生成条码数量
			"HQty":data[i].生成条码数量 , // 本次生成条码数量
			"biaoqianzhangshu": 1
			});
			}
			else {
			rowdata_1.push({
			"HMaterID": data[i].HItemID,
			"HBarCode": data[i].HBarCode,
			"HMaterNumber": data[i].物料代码,
			"HMaterShortNumber": "",
			"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].供应商代码,
			"HSupName": data[i].供应商名称,
			"HEXPUNIT": data[i].保质期单位,
			"HQty": data[i].标准包装数, // 本次生成条码数量
			"biaoqianzhangshu": 1
			});
			}



			}

			@@ -805,7 +783,7 @@
			return;
			}
			for (var j = 0; j < data2.length; j++) {
			rows += data2[j].HMaterID.toString() + ',';
			rows += data2[j].HBarItemID.toString() + ',';
			rows2 += data2[j].HBarCode.toString() + ',';
			}
			rows = rows.substring(rows.length - 1, 0);
			@@ -857,8 +835,9 @@
			data: { "sWhere": sWhere, "user": '', "Organization": sessionStorage["Organization"] },
			success: function (result) {
			if (result.data.length > 0) {
			$("#HSupID").val(result.data[0].HItemID);
			$("#HSupNumber").val(result.data[0].供应商代码);
			$("#HSupName").val(result.data[0].供应商名称);
			$("#HSupID").val(result.data[0].供应商代码);
			} else {
			layer.msg("供应商信息未维护", { time: 5000 });
			}