SRM-LAYUI.git - Gitblit

			@@ -8,6 +8,11 @@
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
			<style type="text/css">
			.layui-input-block {
			width: 200px;
			}
			</style>
			</head>
			<body>

			@@ -46,12 +51,12 @@
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">物料编码</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">物料代码</label>
			<div class="layui-input-block">
			@@ -80,18 +85,18 @@
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">开始日期</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate1" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			</div>-->
			<!--<div class="layui-inline">
			<label class="layui-form-label">结束日期</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate2" id="HDate2">
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">交货时间</label>
			<div class="layui-input-block">
			@@ -108,15 +113,14 @@
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">采购组织</label>
			<div class="layui-input-block">
			<select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">

			</select>
			</div>
			</div>
			<div class="layui-inline">
			</div>-->
			<!--<div class="layui-inline">
			<label class="layui-form-label">是否已下推送货单</label>
			<div class="layui-input-block">
			<select id="HISGenerate" name="HISGenerate" lay-filter="">
			@@ -125,7 +129,7 @@
			<option value="否">否</option>
			</select>
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			@@ -243,32 +247,34 @@
			//{ checkbox: true, fixed: true }
			{ type: 'checkbox', fixed: 'left' }
			//{ type: 'radio', fixed: true }
			, { field: 'sorderid', title: '序号', width: 80/, fixed: true /}
			, { field: 'sorderid', title: '序号', width: 80/, fixed: true / }
			, { field: 'hmainid', title: 'hmainid', sort: true, /fixed: true,/ hide: true }
			, { field: 'hsubid', title: 'hsubid', sort: true, /fixed: true,/ hide: true }
			, { field: '状态', title: '状态', sort: true/, fixed: true /}
			, { field: '反馈状态', title: '反馈状态', width: 100/, fixed: true /}
			, { field: '优先级', title: '优先级', width: 100/, fixed: true /}
			, { field: '单据号', title: '单据号', width: 180, sort: true/, fixed: 'left' /}
			, { field: '日期', title: '日期', width: 180, sort: true/, fixed: 'left' /}
			, { field: '状态', title: '状态', sort: true/, fixed: true / }
			//, { field: '反馈状态', title: '反馈状态', width: 100/, fixed: true /}
			//, { field: '优先级', title: '优先级', width: 100/, fixed: true /}
			, { field: '单据号', title: '单据号', width: 150, sort: true/, fixed: 'left' / }
			, { field: '日期', title: '日期', width: 120, sort: true/, fixed: 'left' / }
			, { field: 'HSupID', title: 'HSupID', width: 180, hide: true }
			, { field: '供应商', title: '供应商', width: 180, sort: true/, fixed: 'left' /}
			, { field: '供应商', title: '供应商', width: 180, sort: true/, fixed: 'left' /, hide: true }
			, { field: '计划跟踪单号', title: '计划跟踪单号', sort: true, hide: true }
			, { field: '物料编码', title: '物料编码', width: 120, sort: true }
			, { field: 'F_xbkf_Combo', title: '自定义标识', width: 120 }
			//, { field: '物料编码', title: '物料编码', width: 120, sort: true }
			, { field: '物料代码', title: '物料代码', width: 120, sort: true }
			, { field: '物料名称', title: '物料名称', width: 120, sort: true }
			, { field: '规格型号', title: '规格型号', width: 120, sort: true }
			, { field: '计量单位', title: '计量单位', width: 80, sort: true }
			, { field: '数量', title: '订货数量', sort: true }
			, { field: '交货地点', title: '交货地点', sort: true }
			, { field: '数量', title: '订单数量', sort: true }
			, { field: '交货日期', title: '交货日期', width: 180, sort: true }
			, { field: '关联数量', title: '关联数量', sort: true }
			, { field: '未关联数量', title: '未关联数量', sort: true }
			, { field: '剩余入库数量', title: '剩余入库数量', sort: true }
			, { field: '剩余收料数量', title: '剩余收料数量', sort: true }
			, { field: '关联数量', title: '已送货数量', sort: true }
			, { field: '未关联数量', title: '未送货数量', sort: true }
			, { field: '剩余入库数量', title: '剩余入库数量', sort: true, hide: true}
			, { field: '剩余收料数量', title: '剩余收料数量', sort: true, hide: true}
			, { field: '关闭状态', title: '关闭状态', sort: true }
			, { field: '变更状态', title: '变更状态', sort: true }
			, { field: '采购组织', title: '采购组织', sort: true }
			, { field: 'FSHDD', title: '送货地点', width: 120 }
			, { field: '交货地点', title: '交货地点', sort: true }
			, { field: '采购组织', title: '采购组织', sort: true, hide: true}
			, { field: '确认人', title: '确认人', sort: true, hide: true }
			, { field: '确认日期', title: '确认日期', sort: true, hide: true }
			, { field: '驳回人', title: '驳回人', sort: true, hide: true }
			@@ -403,15 +409,51 @@
			, data = checkStatus.data;
			ajaxLabelData = data;
			//根据选中的采购订单，重新从金蝶云同步采购订单关联数量过来。考虑采购订单删除和关闭状态，同步状态
			var ids = [];
			$.each(data, function (obj) {
			ids.push(data[obj].hmainid);
			})
			var hasPrivileage = true;
			$.ajax({
			url: GetWEBURL() + 'TestSaverPOInStock',
			type: 'Post',
			async: false,
			traditional: true, // 重点
			data: {
			"": ids // 重点
			},
			success: function (data) {
			if (data.code == "0") {
			layer.alert(data.Message, { icon: 5 });
			hasPrivileage = false;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, page: {
			curr: _cur_page //必须从第 1 页开始
			}
			, loading: false
			, done: function (index, res) {


			}
			});
			return hasPrivileage;
			}
			},
			error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			if (!hasPrivileage) {
			return;
			}
			var rows = '';
			var HEntry = '';
			for (var i = 0; i < data.length; i++) {
			if (data[i]["未关联数量"] == 0) {
			layer.msg("单据号:" + data[i]["单据号"] + "已全部生成送货单！", { icon: 5 });
			return;
			}
			//if (data[i]["未关联数量"] == 0) {
			// layer.msg("单据号:" + data[i]["单据号"] + "已全部生成送货单！", { icon: 5 });
			// return;
			//}
			if (data[i]["状态"] == "已确认") {
			rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
			}
			@@ -439,7 +481,7 @@
			})
			}
			break;
			btn - barcode

			case 'btn-barcode':
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			@@ -599,8 +641,8 @@
			sqlWhere += " and 状态 like ^^%" + $("#HStatus").val() + "%^^";
			if ($("#HBillNo").val() != "")
			sqlWhere += " and 单据号 like ^^%" + $("#HBillNo").val() + "%^^";
			if ($("#HShortNumber").val() != "")
			sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
			//if ($("#HShortNumber").val() != "")
			// sqlWhere += " and 物料编码 like ^^%" + $("#HShortNumber").val() + "%^^";
			if ($("#HNumber").val() != "")
			sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
			if ($("#HName").val() != "")
			@@ -611,20 +653,20 @@
			sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
			//if ($("#HPURCHASEORGID").val() != "")
			// sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
			if ($("#HDate1").val() != "") {
			sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
			}
			if ($("#HDate2").val() != "") {
			sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			}
			if ($("#HISGenerate").val() != "") {
			if ($("#HISGenerate").val() == "是") {
			sqlWhere += " and 未关联数量 <= 0";
			}
			else if ($("#HISGenerate").val() == "否") {
			sqlWhere += " and 未关联数量 > 0";
			}
			}
			//if ($("#HDate1").val() != "") {
			// sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
			//}
			//if ($("#HDate2").val() != "") {
			// sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			//}
			//if ($("#HISGenerate").val() != "") {
			// if ($("#HISGenerate").val() == "是") {
			// sqlWhere += " and 未关联数量 <= 0";
			// }
			// else if ($("#HISGenerate").val() == "否") {
			// sqlWhere += " and 未关联数量 > 0";
			// }
			//}


			var Time = $("#Time").val();