增加手动分配寄存显示备注功能，调整后台逻辑代码。

yuyou_x

2024-03-04 3c39510f9cde5772dc343050f2bdf50460d6a912

增加手动分配寄存显示备注功能，调整后台逻辑代码。

 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,
                         //标题栏
						 
					
                };
                
                //获取仓库下拉框数据

 HTML/views/SOSetting/ExportNotice.html

@@ -336,7 +336,7 @@
                                var html = ''; 
                                if(d.IsWave == '0'){
                                    if(d.Status == '0' || d.Status == '1' ){
                                        if(d.type != "8") {
                                        if(d.Type != "8") {
                                            html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto"> 
                                                <i class="layui-icon layui-icon-ok"></i>自动分配
                                            </a>`;

 Wms/Model/ModelDto/DataDto/StockDetailDto.cs

@@ -178,5 +178,13 @@
        /// Nullable:True
        /// </summary>           
        public string OwnerName { get; set; }


        /// <summary>
        /// Desc:备注
        /// Default:
        /// Nullable:True
        /// </summary>           
        public string Demo { get; set; }
    }
}

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -1556,6 +1556,7 @@
                                PackagNo = noticeDetail.PackagNo,
                                IsBale = item.IsBale,
                                IsBelt = item.IsBelt,
                                Demo = item.Demo,

                                OwnerNo = ownerNo,
                                OwnerName = ownerName,

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1809,6 +1809,10 @@
                    {
                        model.LotNo = model.LotNo.Substring(indexOfDash + 1);
                    }
                    else
                    {
                        model.LotNo = "";
                    }
                }
                //判断物料数量是否为0 为0判断箱码信息 不为0继续
                if (model.SkuQty == 0)

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -361,6 +361,9 @@
                    case "6"://代储出库
                        skuType = "(2)";
                        break;
                    case "8"://寄存出库
                        skuType = "(3)";
                        break;
                    default: //其它出库
                        skuType = "(0,1,2,3,4)";
                        break;
@@ -2573,6 +2576,7 @@
                    LocatNo = a.LocatNo,
                    RoadwayNo = a.RoadwayNo,
                    PalletNo = a.PalletNo,
                    Demo = a.Demo,
                }).ToList();

                return list;