修改Bug问题,PDA已拣数量显示问题、PC拣货时间显示
| | |
| | | field: 'CreateUserName', align: 'center', title: '创建人', width: 120, |
| | | }, |
| | | { |
| | | field: 'CreateTime', align: 'center', title: '创建时间', width: 165, |
| | | field: 'CreateTime', align: 'center', title: '拣货时间', width: 165, |
| | | templet: function (d) { |
| | | return formatDate(d.CreateTime); |
| | | }, |
| | |
| | | }} |
| | | {{ GetBtn7(d) }} |
| | | </script> |
| | | |
| | | <script type="text/html" id="templetUpdateTime"> |
| | | {{# function GetBtn71(d){ |
| | | return formatDate(d.UpdateTime); |
| | | } |
| | | }} |
| | | {{ GetBtn71(d) }} |
| | | </script> |
| | | <script type="text/html" id="templetUnstackingMode"> |
| | | {{# function GetBtn8(d){ |
| | | switch (d.UnstackingMode) { |
| | |
| | | { field: 'IsBale', title: '是否裹包', align: 'center', templet: '#templetIsBale', width: 90 }, |
| | | { field: 'IsBelt', title: '是否打带', align: 'center', templet: '#templetIsBelt', width: 90 }, |
| | | { field: 'CreateTime', align: 'center', title: '创建时间', width: 160, templet: '#templetCreateTime' }, |
| | | { field: 'UpdateTime', align: 'center', title: '完成时间', width: 160, templet: '#templetUpdateTime' }, |
| | | { field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'center', toolbar: '#table-content-list', "disabled": true } |
| | | ]]; |
| | | var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码 |
| | |
| | | { field: 'LotText', title: '批次描述', align: 'center', width: 150, }, |
| | | { field: 'SupplierLot', title: '供货批次', align: 'center', width: 110, }, |
| | | { field: 'Standard', title: '物料规格', align: 'center', width: 120, }, |
| | | //{field: 'CreateTime',align: 'center',title: '创建时间',width: 165,templet: '#templetCreateTime2'}, |
| | | {field: 'CreateTime',align: 'center',title: '拣货',width: 165,templet: '#templetCreateTime2'}, |
| | | { field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true } |
| | | ]]; |
| | | var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码 |
| | |
| | | { |
| | | foreach (var demo in list) |
| | | { |
| | | var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo); |
| | | //if (!string.IsNullOrWhiteSpace(boxNo3)) |
| | | //{ |
| | | // var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo); |
| | | //} |
| | | //else if (!string.IsNullOrWhiteSpace(boxNo)) |
| | | //{ |
| | | // if (expr) |
| | | // { |
| | | |
| | | // } |
| | | |
| | | //} |
| | | var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo); |
| | | if (com != null) |
| | | { |
| | | demo.PickedQty = com.CompleteQty; |
| | |
| | | m.SkuName, |
| | | m.Standard, |
| | | m.PalletNo, |
| | | m.NowPalletNo |
| | | m.NowPalletNo, |
| | | }) |
| | | .Select(a => new CompleteDetailDto() |
| | | { |
| | |
| | | Standard = a.Standard, |
| | | PalletNo = a.PalletNo, |
| | | CompleteQty = SqlFunc.AggregateSum(a.CompleteQty), |
| | | NowPalletNo = a.NowPalletNo |
| | | NowPalletNo = a.NowPalletNo, |
| | | //CreateTime = a.CreateTime |
| | | }).ToOffsetPage(page, limit, ref total); |
| | | count = total; |
| | | return data; |