JC26WMS.git - Gitblit

			@@ -17,13 +17,16 @@
			height: auto;
			line-height: 23px;
			}

			.layui-table-tool-panel{
			top: auto;
			bottom: 29px;
			}

			.layui-table-tool{
			padding-left: 5px;
			}

			/* 表格下拉小箭头隐藏 */
			.layui-table-grid-down {
			display: none;
			@@ -47,18 +50,6 @@
			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">执行状态</label>
			<div class="layui-input-inline">
			<select name="Status" id="Status" lay-filter="Status" lay-search>
			<option value=""></option>
			<option value="0">等待执行</option>
			<option value="1">正在执行</option>
			<option value="2">执行完成</option>
			<option value="3">订单关闭</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">物料编码</label>
			<div class="layui-input-inline">
			<input type="text" id="SkuNo" name="SkuNo" placeholder="物料编码" autocomplete="off"
			@@ -72,11 +63,24 @@
			class="layui-input">
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">客户名称</label>
			<div class="layui-input-inline">
			<input type="text" id="CustomerName" name="CustomerName" placeholder="客户名称" autocomplete="off"
			class="layui-input">
			<input type="text" id="CustomerName" name="CustomerName" placeholder="客户名称"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">执行状态</label>
			<div class="layui-input-inline">
			<select name="Status" id="Status" lay-filter="Status" lay-search>
			<option value=""></option>
			<option value="0">等待执行</option>
			<option value="1">正在执行</option>
			<option value="2">执行完成</option>
			<option value="3">订单关闭</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			@@ -283,8 +287,9 @@
			{field: 'OrderCode',title: '采购单号',align: 'center'},
			{field: 'Status',title: '执行状态',align: 'center',templet: '#buttonTpl'},
			{field: 'CompleteTime',title: '完成时间',align: 'center',templet: '#templetCompleteTime'},
			{ field: 'UserName', title: '制单人', align: 'center', width: 110 },
			{field: 'CreateUserName',title: '创建人',align: 'center',width: 110},
			{field: 'CreateTime',title: '创建时间',align: 'center',templet: '#templetCreateTime'},
			{ field: 'CreateTime', title: '下发时间', align: 'center', templet: '#templetCreateTime' },
			{field: 'UpdateUserName',title: '修改人',align: 'center',width: 110},
			{field: 'UpdateTime',title: '修改时间',align: 'center',templet: '#templetUpdateTime'},
			{field: 'caozuo',title: '操作',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
			@@ -418,8 +423,7 @@
			//#endregion
			}

			function setRight()
			{
			function setRight() {
			$(function() {
			$(".clossClass").hide();//关单
			$(".createClass").hide();//生成入库单
			@@ -458,8 +462,7 @@
			var ImportId = 0;
			table.on('tool(LAY-app-content-list)', function (obj) {
			var data = obj.data;
			switch(obj.event)
			{
			switch (obj.event) {
			case "closs" :
			// 代码区域
			layer.confirm('确定关闭此单据吗？', function(index) {
			@@ -493,8 +496,7 @@
			table.on('tool(LAY-app-content-list2)', function (obj) {
			var data = obj.data;
			var id = data.Id;
			switch(obj.event)
			{
			switch (obj.event) {
			case "createOrd" :
			// 代码区域
			layer.confirm('确定生成入库单据吗？', function(index) {

	HTML/views/ASNSetting/ProcurePlanNotice.html	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Model/InterFaceModel/ProcurePlanModel.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Model/ModelDto/BllAsnDto/ProcurePlanNoticeDto.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/SysServer/StorageLocatServer.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -15,6 +15,11 @@
			public string OrderCode { get; set; }

			/// <summary>
			/// 制单人
			/// </summary>
			public string Username { get; set; }

			/// <summary>
			/// 单据明细
			/// </summary>
			public List<ProcurePlanDetail> ProcurePlanDetails { get; set; }
			@@ -34,7 +39,6 @@
			/// 数量
			/// </summary>
			public decimal? Qty { get; set; }


			/// <summary>
			/// 上游系统行号

			@@ -21,6 +21,11 @@
			public string OrderCode { get; set; }

			/// <summary>
			/// 制单人
			/// </summary>
			public string UserName { get; set; }

			/// <summary>
			/// 状态变更时间
			/// </summary>
			public DateTime? CompleteTime { get; set; }

			@@ -153,7 +153,7 @@
			var q = 0;
			//R01 -01 -01 -02
			//巷道–排-列-层
			for (int r = 13; r <= row; r++)//排
			for (int r = 12; r <= row; r++)//排
			{
			var r1 = "1";
			if (r < 10)