1
wangxinhui
2025-01-10 5b8069bf9b128503fd9a762b8cdba9a6335cf4cd
1
已删除1个文件
已修改6个文件
已添加5个文件
26 ■■■■ 文件已修改
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f07d9c85-8401-4a80-82b3-e3d679447000.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/public/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/public/webconfig.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/api/http.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/extension/stock/stockView.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b9c1ceb-8251-465b-9731-71c408afb4eb.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/24d336e2-4ecf-49a4-b35f-69e0e3bc8d65.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ae4399a-b674-44c1-b399-de956d3e1f8a.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1bb71c7-585a-4025-8323-5e9cda935d44.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f07d9c85-8401-4a80-82b3-e3d679447000.vsidx
Binary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/public/index.html
@@ -9,6 +9,7 @@
  <meta name="description" content="" />
  <link rel="icon" href="<%= BASE_URL %>wms_d.png">
  <title><%= htmlWebpackPlugin.options.title %></title>
  <script src="webconfig.js"></script>
</head>
<body>
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/public/webconfig.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
window.webConfig = {
    "webApiBaseUrl":"http://127.0.0.1:9293/" //"http://10.30.4.92:9283/"
}
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/api/http.js
@@ -12,14 +12,14 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
    axios.defaults.baseURL = 'http://127.0.0.1:9293/';
    axios.defaults.baseURL = window.webConfig.webApiBaseUrl;
}
else if (process.env.NODE_ENV == 'debug') {
    axios.defaults.baseURL = 'http://127.0.0.1:8098/';
}
else if (process.env.NODE_ENV == 'production') {
    axios.defaults.baseURL = 'http://10.30.4.92:9283/';
    axios.defaults.baseURL = window.webConfig.webApiBaseUrl;
}
if (!axios.defaults.baseURL.endsWith('/')) {
    axios.defaults.baseURL+="/";
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/stock/stockView.js
@@ -55,8 +55,8 @@
            }
          }
          if (column.field == 'materielInfo') {
            const today = new Date()
            column.formatter = (row) => {
              if(row.details.length<=0) return;
              const today = new Date();
              const closestDate = row.details
              .map(x => {
@@ -66,13 +66,14 @@
                })
              .reduce((closest, current) => (current.diffInDays < closest.diffInDays? current : closest))
              .date;
              const daysSinceClosest = Math.ceil(Math.abs((today - closestDate) / (1000 * 60 * 60 * 24)));
              return '<span style="color: #F56C6C">'+ daysSinceClosest+"天"+'</span>';
            }
          }
          if (column.field == 'sumStock') {
            column.formatter = (row) => {
              if(row.details.length<=0) return;
              var sum=0;
              const closestDate = row.details
              .map(x => {
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue
@@ -72,6 +72,14 @@
        align: "left",
      },
      {
          field: "warehouseId",
          title: "仓库",
          type: "string",
          width: 100,
          align: "left",
          bind: { key: "warehouses", data: [] },
      },
      {
        field: "locationCode",
        title: "货位编号",
        type: "string",
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b9c1ceb-8251-465b-9731-71c408afb4eb.vsidx
Binary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/24d336e2-4ecf-49a4-b35f-69e0e3bc8d65.vsidx
Binary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ae4399a-b674-44c1-b399-de956d3e1f8a.vsidx
Binary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e1bb71c7-585a-4025-8323-5e9cda935d44.vsidx
Binary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Stock/StockViewDTO.cs
@@ -18,6 +18,10 @@
        /// <summary>
        /// 
        /// </summary>
        public int WarehouseId { get; set; }
        /// <summary>
        ///
        /// </summary>
        public string LocationCode { get; set; }
        /// <summary>
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockViewService.cs
@@ -81,6 +81,7 @@
            ISugarQueryable<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
                => new StockViewDTO
                {
                    WarehouseId=a.WarehouseId,
                    LocationCode = b.LocationCode,
                    Column = a.Column,
                    CreateDate = b.CreateDate,