Merge branch 'wxw'

Administrator

2024-06-17 0bd99d2747b1ce99f250a25776da0112ec5c32db

Merge branch 'wxw'

 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();