Merge branch 'master' into zwc

zhaowc

2024-06-18 a34a111ad3a31c227b9b03ecafbcb3fd1ae3d26a

Merge branch 'master' into zwc

 HTML/views/SOSetting/ExportNotice.html

@@ -57,41 +57,20 @@
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label">单据类型</label>
                        <div class="layui-input-inline">
                            <select name="Type" id="Type" lay-filter="Type" lay-search>
                                <option value=""></option>
                                <!-- 23 -->
                                <option value="0">成品出库</option>
                                <option value="1">领料出库</option>
                                <option value="2">抽检出库</option>
                                <option value="4">不合格品出库</option>
                                <option value="6">代储出库</option>
                                <option value="7">其他出库</option>
                                <!-- 24 -->
                                <!-- <option value="0">成品出库</option>
                                    <option value="1">领料出库</option>
                                    <option value="2">抽检出库</option>
                                    <option value="3">物料取样出库</option>
                                    <option value="4">不合格品出库</option>
                                    <option value="5">中间品出库</option>
                                    <option value="6">代储出库</option>
                                    <option value="7">其他出库</option>
                                    <option value="8">寄存出库</option> -->
                                <!-- 09 -->
                                <!-- <option value="0">标准销售出库</option>
                                    <option value="1">非标销售出库</option>
                                    <option value="2">标准调拨出库</option>
                                    <option value="3">非标调拨出库</option> -->
                                <!-- 08 -->
                                <!-- <option value="0">成品出库</option>
                                    <option value="1">原辅料出库</option>
                                    <option value="2">不合格品出库</option>
                                    <option value="3">取样出库</option> -->
                            </select>
                        </div>
                    </div>
                    </div> -->
                    <div class="layui-inline">
                        <label class="layui-form-label">执行状态</label>
                        <div class="layui-input-inline">
@@ -114,14 +93,14 @@
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label">承运商</label>
                        <div class="layui-input-inline">
                            <select name="LogisticsId" id="LogisticsId" lay-search>
                                <option value=""></option>
                            </select>
                        </div>
                    </div>
                    </div> -->
                    <!-- <div class="layui-inline">
                            <label class="layui-form-label">是否波次</label>
                            <div class="layui-input-inline">
@@ -132,7 +111,7 @@
                                </select>
                            </div>
                        </div> -->
                    <div class="layui-inline">
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label">是否发运</label>
                        <div class="layui-input-inline">
                            <select name="IsDespatch" id="IsDespatch" lay-search>
@@ -141,7 +120,7 @@
                                <option value="1">是</option>
                            </select>
                        </div>
                    </div>
                    </div> -->
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                            lay-filter="LAY-app-contlist-search">
@@ -469,7 +448,7 @@
            var isChongFu = true;
            var xqid = "kong";
            refreshTable();
            // refreshTablemx(xqid);
            //refreshTablemx(xqid);
            //获取承运商物流
            sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
                if (res.code == 0) { //成功 
@@ -495,14 +474,14 @@
                { field: 'SONo', title: '出库单号', align: 'center', fixed: 'left', width: 165, "disabled": true },
                { field: 'Type', title: '单据类型', align: 'center', templet: '#templetType' },
                { field: 'Status', title: '执行状态', align: 'center', templet: '#templetStatus' },
                { field: 'LogisticsName', title: '承运商', align: 'center' },
                { field: 'CustomerName', title: '客户名称', align: 'center' },
                // { field: 'LogisticsName', title: '承运商', align: 'center' },
                // { field: 'CustomerName', title: '客户名称', align: 'center' },
                { field: 'LotNo', title: '批次号', align: 'center' },
                { field: 'LotNoText', title: '批次描述', align: 'center' },
                { field: 'IsDespatch', title: '是否发运', align: 'center', templet: '#templetIsDespatch' },
                { field: 'SupplierLot', title: '供货批次', align: 'center' },
                //{ field: 'IsDespatch', title: '是否发运', align: 'center', templet: '#templetIsDespatch' },
                //{ field: 'SupplierLot', title: '供货批次', align: 'center' },
                { field: 'Origin', title: '来源', align: 'center' },
                { field: 'Demo', title: '备注', align: 'center', width: 180 },
                { field: 'Demo', title: '备注', align: 'center'},
                { field: 'CreateUserName', title: '创建人', align: 'center' },
                { field: 'CreateTime', title: '创建时间', align: 'center', templet: '#templetCreateTime' },
                { field: 'UpdateUserName', title: '修改人', align: 'center' },
@@ -777,21 +756,21 @@
            var DetailColsArr = [[
                { field: '', title: '序号', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },
                { field: 'SONo', title: '出库单号', align: 'center', fixed: 'left', width: 165 },
                { field: 'SkuNo', title: '物料编码', align: 'center', width: 130 },
                { field: 'SkuName', title: '物料名称', align: 'center', width: 152 },
                { field: 'Standard', title: '物料规格', align: 'center', width: 270 },
                { field: 'LotNo', title: '批次号', align: 'center', width: 150 },
                { field: 'Qty', title: '计划数量', align: 'center', width: 100 },
                { field: 'AllotQty', title: '分配数量', align: 'center', width: 100 },
                { field: 'FactQty', title: '下架数量', align: 'center', width: 100 },
                { field: 'CompleteQty', title: '拣货数量', align: 'center', width: 100 },
                { field: 'IsBale', title: '是否裹包', align: 'center', templet: '#templetIsBale', width: 90 },
                { field: 'IsBelt', title: '是否打带', align: 'center', templet: '#templetIsBelt', width: 90 },
                { field: 'LotText', title: '批次描述', align: 'center', width: 100 },
                { field: 'PackagName', title: '包装名称', align: 'center', width: 120 },
                { field: 'SupplierLot', title: '供货批次', align: 'center', width: 120 },
                { field: 'Price', title: '单价', align: 'center', width: 80 },
                { field: 'Money', title: '总金额', align: 'center', width: 90 },
                { field: 'SkuNo', title: '物料编码', align: 'center'},
                { field: 'SkuName', title: '物料名称', align: 'center'},
                { field: 'Standard', title: '物料规格', align: 'center'},
                { field: 'LotNo', title: '批次号', align: 'center'},
                { field: 'Qty', title: '计划数量', align: 'center'},
                //{ field: 'AllotQty', title: '分配数量', align: 'center', width: 100 },
                //{ field: 'FactQty', title: '下架数量', align: 'center', width: 100 },
                //{ field: 'CompleteQty', title: '拣货数量', align: 'center', width: 100 },
                //{ field: 'IsBale', title: '是否裹包', align: 'center', templet: '#templetIsBale', width: 90 },
                //{ field: 'IsBelt', title: '是否打带', align: 'center', templet: '#templetIsBelt', width: 90 },
                { field: 'LotText', title: '批次描述', align: 'center'},
                //{ field: 'PackagName', title: '包装名称', align: 'center', width: 120 },
                //{ field: 'SupplierLot', title: '供货批次', align: 'center', width: 120 },
                //{ field: 'Price', title: '单价', align: 'center', width: 80 },
                //{ field: 'Money', title: '总金额', align: 'center', width: 90 },
                { field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
            ]];
            var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
@@ -998,17 +977,23 @@
                        contentType: 'application/json',
                        headers: { ToKen: $.cookie('token') },
                        toolbar: '#toolbarDemo',
                        defaultToolbar: ['print'], //'print', 'exports'
                        defaultToolbar: [''], //'print', 'exports'
                        page: true,
                        limit: pageCnt,
                        limits: pageLimits,
                        cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
						
                        done: function () {
                            initMenu();
                            //自定义列宽
                            SetTableColW('LAY-app-content-list2', 'BllSo/GetExportNoticeDetailList', DetailColsSysArr);
                        },
                        cols: colsJson2
                        cols: colsJson2,
                        layout: {
                            row: {
                                entiren: true // 设置表格宽度铺满
                            }
                        }
                    });
                });
                //#endregion

 HTML/views/WareHouseSetting/Area.html

@@ -327,7 +327,7 @@
                                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                                    }, function() {
                                                        layer.close(index); //关闭弹层
                                                        // refreshTable($("#CategoryName").val(),$("#AreaNo").val());
                                                        refreshTable($("#CategoryName").val(),$("#AreaNo").val());
                                                        doing = true;
                                                    });
                                                }

 HTML/views/WareHouseSetting/Locate.html

@@ -323,22 +323,24 @@
                            field: 'WareHouseName',
                            title: '所属仓库',
                            align: 'center',
                            width: 140,
                            width: 180,
                            fixed: 'left',
                            templet: function(d) {

                                return d.WareHouseNo + '-' + d.WareHouseName;
                            }
                        }, {
                            field: 'RoadwayNo',
                            title: '所属巷道',
                            align: 'center',
                            width: 130,
                            templet: function(d) {
                        }, 
                        // {
                        //     field: 'RoadwayNo',
                        //     title: '所属巷道',
                        //     align: 'center',
                        //     width: 130,
                        //     templet: function(d) {

                                return d.RoadwayNo + '-' + d.RoadwayName;
                            }
                        }, {
                        //         return d.RoadwayNo + '-' + d.RoadwayName;
                        //     }
                        // }, 
                        {
                            field: 'AreaName',
                            title: '所属区域',
                            align: 'center',
@@ -381,22 +383,24 @@
                            title: '深度',
                            align: 'center',
                            width: 70,
                        }, {
                            field: 'Height',
                            title: '高度',
                            align: 'center',
                            width: 90,
                        }, {
                            field: 'Weight',
                            title: '重量',
                            align: 'center',
                            width: 90,
                        }, {
                            field: 'TempName',
                            title: '存储坏境',
                            align: 'center',
                            width: 110,
                        }, {
                        }, 
                        // {
                        //     field: 'Height',
                        //     title: '高度',
                        //     align: 'center',
                        //     width: 90,
                        // }, {
                        //     field: 'Weight',
                        //     title: '重量',
                        //     align: 'center',
                        //     width: 90,
                        // }, {
                        //     field: 'TempName',
                        //     title: '存储坏境',
                        //     align: 'center',
                        //     width: 110,
                        // }, 
                        {
                            title: '操作',
                            fixed: 'right',
                            width: 120,

 Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs

@@ -93,7 +93,7 @@
                    outDtoList.Add(locatEntry2);

                    // 正式运行程序放开
                    var jsonData = JsonConvert.SerializeObject(outDtoList);
                    /*var jsonData = JsonConvert.SerializeObject(outDtoList);
                    string response = "";

                    try
@@ -109,7 +109,7 @@
                    catch (Exception ex)
                    {
                        throw new Exception(ex.Message);
                    }
                    }*/
                }

                Db.CommitTran();