1

hutongqing

2024-10-15 f277dbca9d85812db3309e12a034e5e562e0f135

1

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/136ff540-9b25-4fe9-9296-15d34a430bcd.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/23ae8195-bcb2-47d3-8d97-12c21e7178b3.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2b11c927-14d8-4e57-a539-b0e07bdba959.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/34979e00-b1e9-4af1-b75e-e2860424735e.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/803137d8-f6db-47a2-b7bb-385b40de001b.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/af5fd854-4fcc-462d-8592-8cd25a8de131.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ffb72dcf-f9d1-43b8-a473-c74f93d975d9.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs

@@ -616,7 +616,7 @@
                List<TEntity> deviceInfos = BaseDal.QueryData();
                string str = JsonConvert.SerializeObject(deviceInfos, Formatting.Indented);
                List<Dictionary<string, object>> keyValuePairs = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(str);
                FileHelper.WriteFileAndDelOldFile($"{AppDomain.CurrentDomain.BaseDirectory}wwwroot/{seedDataFolder}", str);
                FileHelper.WriteFileAndDelOldFile($"wwwroot/{seedDataFolder}", str);
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs

@@ -24,7 +24,7 @@
        public bool IsFull { get; set; }

        [SugarColumn(IsNullable = false, ColumnDescription = "库存状态")]
        public int StockStatus {  get; set; }
        public int StockStatus { get; set; }

        [SugarColumn(IsNullable = true, ColumnDescription = "备注")]
        public string Remark { get; set; }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs

@@ -46,6 +46,7 @@

            return outStockLockInfos;
        }

        public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId)
        {
            return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv

@@ -10,10 +10,9 @@
    "ParentId": 0,
    "Url": null,
    "OrderNo": 4000,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:07.567"
  },
@@ -28,10 +27,9 @@
    "ParentId": 1,
    "Url": "/Sys_User",
    "OrderNo": 2000,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:14.03"
  },
@@ -46,10 +44,9 @@
    "ParentId": 1,
    "Url": "/permission",
    "OrderNo": 1000,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:20.727"
  },
@@ -64,10 +61,9 @@
    "ParentId": 1,
    "Url": "/Sys_Role",
    "OrderNo": 900,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:23.177"
  },
@@ -82,10 +78,9 @@
    "ParentId": 0,
    "Url": "/",
    "OrderNo": 0,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:38.703"
  },
@@ -100,10 +95,9 @@
    "ParentId": 5,
    "Url": "/sysmenu",
    "OrderNo": 10,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:42.007"
  },
@@ -118,12 +112,11 @@
    "ParentId": 5,
    "Url": "/Sys_Dictionary",
    "OrderNo": 10,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.1257018+08:00"
    "ModifyDate": "2024-09-04T11:06:31.127"
  },
  {
    "MenuId": 8,
@@ -136,10 +129,9 @@
    "ParentId": 0,
    "Url": "/",
    "OrderNo": 500,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:30.557"
  },
@@ -154,10 +146,9 @@
    "ParentId": 8,
    "Url": "/Sys_Log/Manager",
    "OrderNo": 0,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:34.273"
  },
@@ -172,17 +163,16 @@
    "ParentId": 0,
    "Url": "/",
    "OrderNo": 9000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-04T10:44:31.457"
  },
  {
    "MenuId": 13,
    "MenuName": "任务信息",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"回滚到上一步\",\"value\":\"Previous\"},{\"text\":\"跳转到下一步\",\"value\":\"Next\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"}]",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"导出\",\"value\":\"Export\"}]",
    "Icon": null,
    "Description": null,
    "Enable": 1,
@@ -190,12 +180,11 @@
    "ParentId": 12,
    "Url": "/task",
    "OrderNo": 500,
    "MenuType": 99,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-05-09T15:50:30.557"
    "ModifyDate": "2024-09-20T09:15:35.93"
  },
  {
    "MenuId": 17,
@@ -208,10 +197,9 @@
    "ParentId": 0,
    "Url": "/",
    "OrderNo": 10000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:37:49.467",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-04T10:44:15.293"
  },
@@ -226,10 +214,9 @@
    "ParentId": 0,
    "Url": "",
    "OrderNo": 8000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:45:08.057",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-04T10:50:35.37"
  },
@@ -244,17 +231,16 @@
    "ParentId": 0,
    "Url": "",
    "OrderNo": 7000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:45:29.557",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-04T10:53:10.417"
  },
  {
    "MenuId": 21,
    "MenuName": "仓库信息",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"}]",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"},{\"text\":\"启用\",\"value\":\"Enable\"},{\"text\":\"禁用\",\"value\":\"Disable\"}]",
    "Icon": "",
    "Description": null,
    "Enable": 1,
@@ -262,17 +248,16 @@
    "ParentId": 17,
    "Url": "/warehouse",
    "OrderNo": 10000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:47:53.653",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.125715+08:00"
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-24T14:36:38.443"
  },
  {
    "MenuId": 22,
    "MenuName": "区域信息",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"}]",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"},{\"text\":\"启用\",\"value\":\"Enable\"},{\"text\":\"禁用\",\"value\":\"Disable\"}]",
    "Icon": "",
    "Description": null,
    "Enable": 1,
@@ -280,17 +265,16 @@
    "ParentId": 17,
    "Url": "areaInfo",
    "OrderNo": 9000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:48:34.41",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.1257166+08:00"
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-24T14:36:41.967"
  },
  {
    "MenuId": 23,
    "MenuName": "货位信息",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"}]",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导出\",\"value\":\"Export\"},{\"text\":\"启用\",\"value\":\"Enable\"},{\"text\":\"禁用\",\"value\":\"Disable\"}]",
    "Icon": "",
    "Description": null,
    "Enable": 1,
@@ -298,12 +282,11 @@
    "ParentId": 17,
    "Url": "/locationInfo",
    "OrderNo": 8000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:49:01.603",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-04T10:49:05.24"
    "ModifyDate": "2024-09-24T14:36:47.427"
  },
  {
    "MenuId": 24,
@@ -316,12 +299,11 @@
    "ParentId": 17,
    "Url": "/materielInfo",
    "OrderNo": 7000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:49:40.427",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.1257224+08:00"
    "ModifyDate": "2024-09-04T11:06:31.127"
  },
  {
    "MenuId": 25,
@@ -334,10 +316,9 @@
    "ParentId": 19,
    "Url": "/inboundOrder",
    "OrderNo": 10000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:50:22.18",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-04T10:50:25.91"
  },
@@ -347,17 +328,16 @@
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"}]",
    "Icon": "",
    "Description": null,
    "Enable": 1,
    "Enable": 0,
    "TableName": "Dt_InboundOrderDetail",
    "ParentId": 19,
    "Url": "/inboundOrderDetail",
    "OrderNo": 9000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:51:03.03",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.1257255+08:00"
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-24T11:12:44.15"
  },
  {
    "MenuId": 27,
@@ -370,12 +350,11 @@
    "ParentId": 19,
    "Url": "/outboundOrder",
    "OrderNo": 8000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:51:30.957",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.125727+08:00"
    "ModifyDate": "2024-09-04T11:06:31.127"
  },
  {
    "MenuId": 28,
@@ -383,17 +362,16 @@
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"新建\",\"value\":\"Add\"},{\"text\":\"删除\",\"value\":\"Delete\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导入\",\"value\":\"Import\"},{\"text\":\"导出\",\"value\":\"Export\"}]",
    "Icon": "",
    "Description": null,
    "Enable": 1,
    "Enable": 0,
    "TableName": "Dt_OutboundOrderDetail",
    "ParentId": 19,
    "Url": "/outboundOrderDetail",
    "OrderNo": 7000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:52:08.863",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.1257284+08:00"
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": "admin",
    "ModifyDate": "2024-09-24T11:12:46.923"
  },
  {
    "MenuId": 29,
@@ -406,12 +384,11 @@
    "ParentId": 20,
    "Url": "/stockInfo",
    "OrderNo": 10000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:53:03.517",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.1257298+08:00"
    "ModifyDate": "2024-09-04T11:06:31.127"
  },
  {
    "MenuId": 30,
@@ -424,11 +401,61 @@
    "ParentId": 20,
    "Url": "stockInfoDetail",
    "OrderNo": 9000,
    "MenuType": null,
    "Menus": null,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-04T10:53:51.893",
    "CreateDate": "2024-09-04T11:08:55.727",
    "Modifier": null,
    "ModifyDate": "2024-09-04T11:06:31.1257312+08:00"
    "ModifyDate": "2024-09-04T11:06:31.127"
  },
  {
    "MenuId": 31,
    "MenuName": "巷道信息",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"},{\"text\":\"编辑\",\"value\":\"Update\"},{\"text\":\"导出\",\"value\":\"Export\"},{\"text\":\"启用\",\"value\":\"Enable\"},{\"text\":\"禁用\",\"value\":\"Disable\"}]",
    "Icon": "",
    "Description": null,
    "Enable": 1,
    "TableName": "Dt_RoadwayInfo",
    "ParentId": 17,
    "Url": "/roadwayInfo",
    "OrderNo": 8500,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-06T14:50:43.827",
    "Modifier": "admin",
    "ModifyDate": "2024-09-24T14:36:44.583"
  },
  {
    "MenuId": 32,
    "MenuName": "库存视图",
    "Auth": "[{\"text\":\"查询\",\"value\":\"Search\"}]",
    "Icon": "",
    "Description": null,
    "Enable": 1,
    "TableName": "StockView",
    "ParentId": 20,
    "Url": "/stockView",
    "OrderNo": 9000,
    "MenuType": 0,
    "Creater": "admin",
    "CreateDate": "2024-09-18T17:09:10.92",
    "Modifier": null,
    "ModifyDate": null
  },
  {
    "MenuId": 41,
    "MenuName": "入库订单",
    "Auth": "",
    "Icon": "",
    "Description": null,
    "Enable": 1,
    "TableName": "/",
    "ParentId": 0,
    "Url": "/pages/materielGroup/inboundOrder",
    "OrderNo": 0,
    "MenuType": 1,
    "Creater": "admin",
    "CreateDate": "2024-09-19T15:38:12.703",
    "Modifier": "admin",
    "ModifyDate": "2024-09-30T16:34:47.333"
  }
]