zymesSrmLayUi.git

			@@ -285,6 +285,7 @@
			, { field: 'HDate', title: '预计到货日期', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
			, { field: 'HPrice', title: '单价', width: 100, hide: true }
			, { field: 'HMoney', title: '金额', width: 100, hide: true }
			, { field: 'HRemark', title: '备注', width: 200, edit: true }
			//, { field: 'HRemark', title: '备注', width: 100 }
			, { field: 'HPOOrderInterID', title: '采购订单主内码', width: 150, hide: true }
			, { field: 'HPOOrderEntryID', title: '采购订单子内码', width: 150, hide: true }
			@@ -347,35 +348,44 @@
			//dataindex = dataindex + x;
			data1 = {
			"sorderid": oldData.length + 1
			, "HMTONO": data[i].HMTONO
			, "HMaterID": data[i].HMaterID
			, "HMaterNumber": data[i].HMaterNumber
			, "HOldMaterNumber": data[i].HOldMaterNumber
			, "HMaterShortNumber": data[i].HMaterShortNumber
			, "HMaterName": data[i].HMaterName
			, "HMaterModel": data[i].HMaterModel
			, "HUnitName": data[i].HUnitName
			, "HUnitNumber": data[i].HUnitNumber
			, "HUnitID": data[i].HUnitID
			, "FPrintCount": data[i].FPrintCount
			, "HQty": data[i].HQty
			, "HRQty": data[i].HRQty
			, "HSQty": data[i].HSQty
			, "HBatchNo": data[i].HBatchNo
			, "HKFDate": data[i].HKFDate
			, "HKFPeriod": data[i].HKFPeriod
			, "HDate": data[i].HDate
			, "HPrice": data[i].HPrice
			, "HMoney": data[i].HMoney
			, "HRemark": data[i].HRemark
			, "HPOOrderInterID": data[i].HPOOrderInterID
			, "HPOOrderEntryID": data[i].HPOOrderEntryID
			, "HPOOrderBillNo": data[i].HPOOrderBillNo
			, "HWWOrderInterID": data[i].HWWOrderInterID
			, "HWWOrderEntryID": data[i].HWWOrderEntryID
			, "HWWOrderBillNo": data[i].HWWOrderBillNo
			, "HWWOrderDetaiLID": data[i].HWWOrderDetaiLID
			, "HBillType": data[i].HBillType
			, "HSourceBillType": data[i].HSourceBillType
			, "HSourceBillNo": data[i].HSourceBillNo
			//, "HExpressNumberSub": data[i].HExpressNumberSub
			//, "HExpressSupplierSub": data[i].HExpressSupplierSub
			, "HSourceInterID": data[i].HSourceInterID
			, "HSourceEntryID": data[i].HSourceEntryID
			, "HMTONO": data[i].HMTONO
			, "HDate": data[i].HDate
			}
			, "FSHDD": data[i].FSHDD
			, "F_xbkf_Combo": data[i].F_xbkf_Combo
			}
			//oldData.push(data1);
			oldData.splice(dataindex, 0, data1);
			};
			@@ -464,7 +474,7 @@
			$(obj.tr).find(".layui-table-edit").keyup(function () {
			var $input = $(this), val = $input.val();
			if (!val) val = "0";
			$input.val(val.replace(/[^\d]/g, ''));
			$input.val(val.replace(/[^\d\.?\d]/g, ''));
			});
			}

			@@ -535,6 +545,7 @@
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sMainSub = sMainStr + ';' + sSubStr;

			if (!AllowLoadData(sSubStr))//数据验证
			{
			return false;
			@@ -660,10 +671,11 @@
			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: "温馨提示" });
			@@ -674,7 +686,7 @@
			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;