JC34WMS.git - Gitblit

			@@ -121,8 +121,8 @@
			</div>

			<script src="../../layuiadmin/layui/layui.js"></script>
			<script src="../../js/public.js"></script>
			<script src="../../js/jquery-3.5.1.min.js"></script>
			<script src="../../js/public.js"></script>
			<script src="../../js/jquery.cookie.js"></script>
			<script>
			var uid = $.cookie('userId');
			@@ -141,6 +141,7 @@
			var h1 = GetTableHeight();
			// var h1 = GetTkableTopHeight();
			// console.log(h1)
			var tableIns;

			laydate.render({
			elem: '#StartTime',
			@@ -150,31 +151,6 @@
			elem: '#EndTime',
			format: 'yyyy-MM-dd' //可任意组合
			});
			//获取当前时间
			function getNowTime() {
			var date = new Date();
			//年 getFullYear()：四位数字返回年份
			var year = date.getFullYear(); //getFullYear()代替getYear()
			//月 getMonth()：0 ~ 11
			var month = date.getMonth() + 1;
			//日 getDate()：(1 ~ 31)
			var day = date.getDate();
			//时 getHours()：(0 ~ 23)
			var hour = date.getHours();
			//分 getMinutes()： (0 ~ 59)
			var minute = date.getMinutes();
			//秒 getSeconds()：(0 ~ 59)
			var second = date.getSeconds();

			var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
			return time;

			//小于10的拼接上0字符串

			};
			function addZero(s) {
			return s < 10 ? ('0' + s) : s;
			};

			var $ = layui.$;
			refreshTable("", "", "", "", "", "");
			@@ -213,22 +189,6 @@
			} else {
			colsJson = TotalColsArr
			}
			infoOptions = {
			elem: '#LAY-app-content-list',
			height: h1,
			id: 'LAY-app-content-list',
			page: true,
			limit: pageCnt,
			limits: pageLimits,
			even: true,
			cellMinWidth: 80, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
			done: function () {
			//自定义列宽
			SetTableColW('LAY-app-content-list', 'BllCheck/GetLogWorkShopList', TotalColsSysArr);
			},
			cols: colsJson
			};

			var param = {
			SkuNo: SkuNo, //物料号
			SkuName: SkuName, //物料名称
			@@ -237,25 +197,29 @@
			BoxNo:BoxNo,//箱码
			Type: Type, //类型
			};
			sendData(IP + "/BllCheck/GetLogWorkShopList", param, 'post', function (res) {
			console.log(res)
			if (res.code == 0) { //成功
			var list = res.data;
			$.extend(infoOptions, {
			data: list
			table.render({
			elem: '#LAY-app-content-list',
			url: IP + "/BllCheck/GetLogWorkShopList",
			method: 'post',
			height: h1,//'full-'+hei1
			id: 'LAY-app-content-list',
			where: param,
			contentType: 'application/json',
			// toolbar: '#toolbarDemo',
			defaultToolbar: [], //'filter','print', 'exports'
			headers: { ToKen: $.cookie('token') },
			page: true,
			even: true,
			limit: pageCnt,
			limits: pageLimits,
			cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
			done: function (res) {
			//自定义列宽
			SetTableColW('LAY-app-content-list', 'BllCheck/GetLogWorkShopList', TotalColsSysArr);
			},
			cols: colsJson
			});
			infoOptions.page = {
			curr: 1
			}
			tableIns = table.render(infoOptions);
			}
			else { //不成功
			layer.msg('获取车间出入库日志列表信息失败！', {
			icon: 2,
			time: 2000 //2秒关闭（如果不配置，默认是3秒）
			}, function () { });
			}
			});

			});
			//#endregion
			}
			@@ -282,17 +246,7 @@
			layer.open({
			type: 2,
			title: '自定义列',
			content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBindList&ColsSysArr=' + TotalColsSysArr,
			maxmin: false,
			resize: false,
			area: ['970px', '650px']
			});
			},
			customCols2: function () {
			layer.open({
			type: 2,
			title: '自定义列',
			content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr=' + DetailColsSysArr,
			content: '../SystemSettings/HeaderSetting.html?Href=BllCheck/GetLogWorkShopList&ColsSysArr=' + TotalColsSysArr,
			maxmin: false,
			resize: false,
			area: ['970px', '650px']

	HTML/views/HouseWithinSetting/LogWorkShop.html	96 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1653,10 +1653,10 @@
			boxNo, "出库", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
			Db.CommitTran();
			}
			catch (AppFriendlyException e)
			{
			Db.RollbackTran();
			}
			//catch (AppFriendlyException e)
			//{
			// Db.RollbackTran();
			//}
			catch (Exception e)
			{
			Db.RollbackTran();