Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

Administrator

2024-03-04 778d43af844492ef0496b0981ee95e0a1da17a6e

 HTML/views/SOSetting/ExportHandOutList.html

@@ -95,6 +95,134 @@
            var repeatClick = true;
            var tableIns;
            refreshTable();
            //正常显示
            var colsa =
            [[
               {
                  field: 'LocatNo',
                  title: '储位编码',
                  align: 'center',
                  width: 110,
                  fixed: 'left',
               },{
                  field: 'PalletNo',
                  title: '托盘条码',
                  align: 'center',
                  width: 100,
                  fixed: 'left',
               }, {
                  field: 'SkuNo',
                  title: '物品编码',
                  width: 100,
                  align: 'center',
                  fixed: 'left',
               }, {
                  field: 'SkuName',
                  title: '物品名称',
                  minWidth: 200,
                  align: 'center',
                  fixed: 'left',
               }, {
                  field: 'LotNo',
                  title: '批次',
                  align: 'center'
               }, {
                  field: 'LotText',
                  title: '批次描述',
                  align: 'center',
               }, {
                  field: 'Standard',
                  title: '物品规格',
                  align: 'center',
                  minWidth: 100
               }, {
                  field: 'RoadwayNo',
                  title: '所属巷道',
                  align: 'center',
                  width: 100
               }, {
                  field: 'Qty',
                  title: '库存数量',
                  width: 100,
                  fixed: 'right',
                  align: 'center',
               }, {
                  field: 'ExportQty',
                  title: '出库数量',
                  align: 'center',
                  width: 100,
                  fixed: 'right',
                  edit: 'number',
                  event: 'dataNumber',
               }
            ]];
            //寄存显示
            var colsb = 
            [[
               {
                  field: 'LocatNo',
                  title: '储位编码',
                  align: 'center',
                  width: 110,
                  fixed: 'left',
               },{
                  field: 'PalletNo',
                  title: '托盘条码',
                  align: 'center',
                  width: 100,
                  fixed: 'left',
               }, {
                  field: 'SkuNo',
                  title: '物品编码',
                  width: 100,
                  align: 'center',
                  fixed: 'left',
               }, {
                  field: 'SkuName',
                  title: '物品名称',
                  minWidth: 200,
                  align: 'center',
                  fixed: 'left',
               }, {
                  field: 'LotNo',
                  title: '批次',
                  align: 'center'
               }, {
                  field: 'LotText',
                  title: '批次描述',
                  align: 'center',
               }, {
                  field: 'Standard',
                  title: '物品规格',
                  align: 'center',
                  minWidth: 100
               }, {
                  field: 'Demo',
                  title: '备注',
                  align: 'center',
                  width: 100
               }, {
                  field: 'RoadwayNo',
                  title: '所属巷道',
                  align: 'center',
                  width: 100
               },{
                  field: 'Qty',
                  title: '库存数量',
                  width: 100,
                  fixed: 'right',
                  align: 'center',
               }, {
                  field: 'ExportQty',
                  title: '出库数量',
                  align: 'center',
                  width: 100,
                  fixed: 'right',
                  edit: 'number',
                  event: 'dataNumber',
               }
            ]];

            function refreshTable() {
               detailId = getQueryString('Id');
               var param = {
@@ -107,12 +235,21 @@
               };
               sendData(IP + "/BllSo/GetHandOutList", param, 'post', function(res) {
                  if (res.code == 0) { //成功
							
                     var list = res.data;
                     $.extend(infoOptions, {
                        data: list
                     });
                     infoOptions.page = {
                        curr: 1
                     }
                     infoOptions.cols = colsa;
                     //判断单据明细信息是否为寄存明细
                     if(res.data[0].SkuNo == "100088")
                     {
                        infoOptions.cols = colsb;
                        // colsa = colsb;
                        console.log(colsa)
                     }
                     tableIns = table.render(infoOptions);
                  } else { //不成功
@@ -131,6 +268,7 @@
                  }
               });
            }
				
            var infoOptions = {
               elem: '#LAY-app-content-list',
               height: 'full-160',
@@ -139,67 +277,10 @@
               limit: pageCnt,
               limits: pageLimits,
               cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
               cols: [
                  [ //标题栏
                     {
                        field: 'LocatNo',
                        title: '储位编码',
                        align: 'center',
                        width: 110,
                        fixed: 'left',
                     },{
                        field: 'PalletNo',
                        title: '托盘条码',
                        align: 'center',
                        width: 100,
                        fixed: 'left',
                     }, {
                        field: 'SkuNo',
                        title: '物品编码',
                        width: 100,
                        align: 'center',
                        fixed: 'left',
                     }, {
                        field: 'SkuName',
                        title: '物品名称',
                        minWidth: 200,
                        align: 'center',
                        fixed: 'left',
                     }, {
                        field: 'LotNo',
                        title: '批次',
                        align: 'center'
                     }, {
                        field: 'LotText',
                        title: '批次描述',
                        align: 'center',
                     }, {
                        field: 'Standard',
                        title: '物品规格',
                        align: 'center',
                        minWidth: 100
                     }, {
                        field: 'RoadwayNo',
                        title: '所属巷道',
                        align: 'center',
                        width: 100
                     }, {
                        field: 'Qty',
                        title: '库存数量',
                        width: 100,
                        fixed: 'right',
                        align: 'center',
                     }, {
                        field: 'ExportQty',
                        title: '出库数量',
                        align: 'center',
                        width: 100,
                        fixed: 'right',
                        edit: 'number',
                        event: 'dataNumber',
                     }
                  ]
               ],
               cols: null,
                   //标题栏
						 
					
            };
            
            //获取仓库下拉框数据