1

heshaofeng

2026-01-21 c47acd2171faa2010384c57cd74c6ad1e415a13e

1

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/Home.vue

@@ -31,7 +31,7 @@
              <Download />
            </el-icon>
          </div>
          <div class="card-title">今日入库完成数</div>
          <div class="card-title">今日入库完成箱数</div>
          <div class="card-value">{{ bigscreendata.inboundCount }}</div>
        </div>
      </el-col>
@@ -42,7 +42,7 @@
              <Upload />
            </el-icon>
          </div>
          <div class="card-title">今日出库完成数</div>
          <div class="card-title">今日出库完成箱数</div>
          <div class="card-value">{{ bigscreendata.outboundCount }}</div>
        </div>
      </el-col>
@@ -114,7 +114,7 @@
      </el-col>
      <el-col :span="8">
        <div class="chart-card">
          <div class="chart-title">近7日出入库趋势（图像化走势）</div>
          <div class="chart-title">近7日出入库单据趋势（图像化走势）</div>
          <div ref="stockTrendRef" class="chart-container"></div>
        </div>
      </el-col>
@@ -203,9 +203,9 @@
  const uniqueMap = new Map();
  expirationList.forEach(item => {
    const uniqueKey = [
      item.materielCode || '未知编码',
      item.batchNo || '未知批次',
      item.palletCode || '未知托盘',
      item.materielCode,
      item.batchNo,
      item.palletCode,
    ].join('|');
    if (!uniqueMap.has(uniqueKey)) {
      uniqueMap.set(uniqueKey, item);
@@ -227,16 +227,16 @@
      expireLevel = '30天以上';
    }
    return {
      materielCode: item.materielCode || '未知编码',
      materielName: item.materielName || '未知名称',
      batchNo: item.batchNo || '未知批次',
      validDate: item.validDate || '未知有效期',
      materielCode: item.materielCode,
      materielName: item.materielName,
      batchNo: item.batchNo,
      validDate: item.validDate,
      daysToExpiration: daysToExpiration,
      expireLevel: expireLevel,
      stockQuantity: item.stockQuantity || 0,
      locationCode: item.locationCode || '未知库位',
      palletCode: item.palletCode || '未知托盘',
      unit: item.unit || 'PCS'
      locationCode: item.locationCode,
      palletCode: item.palletCode,
      unit: item.unit
    };
  });
});
@@ -293,12 +293,12 @@

  // æ ¼å¼åŒ–入库订单
  const formattedInbound = inboundOrders.map(item => ({
    upperOrderNo: item.upperOrderNo || item.inboundOrderNo || '未知单号',
    upperOrderNo: item.upperOrderNo || item.inboundOrderNo,
    taskStatus: item.orderStatus || 0,
    taskType: 'inbound',
    businessType: item.businessType || '',
    returnToMESStatus: item.returnToMESStatus || 0,
    factoryArea: item.factoryArea || '未知厂区',
    factoryArea: item.factoryArea,
    modifier: item.modifier,
    createDate: item.createDate,
    modifyDate: item.modifyDate
@@ -306,15 +306,15 @@

  // æ ¼å¼åŒ–出库订单
  const formattedOutbound = outboundOrders.map(item => ({
    upperOrderNo: item.upperOrderNo || item.orderNo || '未知单号',
    upperOrderNo: item.upperOrderNo || item.orderNo,
    taskStatus: item.orderStatus || 0,
    taskType: 'outbound',
    businessType: item.businessType || '',
    returnToMESStatus: item.returnToMESStatus || 0,
    factoryArea: item.factoryArea || '未知厂区',
    modifier: item.modifier || '未知修改人',
    createDate: item.createDate || '未知时间',
    modifyDate: item.modifyDate || '未知时间'
    factoryArea: item.factoryArea,
    modifier: item.modifier,
    createDate: item.createDate,
    modifyDate: item.modifyDate
  }));

  const merged = [...formattedInbound, ...formattedOutbound];

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/Index.vue

@@ -270,7 +270,7 @@
      { name: "white", color: "#fff" },
    ]);
    const links = ref([
      { text: "个人中心", path: "/UserInfo", id: -1, icon: "el-icon-s-custom" },
      // { text: "个人中心", path: "/UserInfo", id: -1, icon: "el-icon-s-custom" },
      {
        text: "安全退出",
        path: "/login",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/system/Sys_Dictionary.vue

@@ -72,8 +72,8 @@
    });
    const searchFormOptions = ref([
      [
        { title: "字典编号", field: "dicNo" },
        { title: "字典名称", field: "dicName", type: "textarea" },
        { title: "字典编号", field: "dicNo" ,type:"like"},
        { title: "字典名称", field: "dicName", type: "like" },
        { title: "父级ID", field: "parentId", type: "number" },
      ],
      [

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs

@@ -3,6 +3,7 @@
using MailKit.Search;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using Org.BouncyCastle.Asn1.X509;
using Org.BouncyCastle.Bcpg;
using SixLabors.ImageSharp;
using SqlSugar;
using System;
@@ -54,7 +55,8 @@
        private readonly IRepository<Dt_MesReturnRecord> _mesReturnRecord;
        private readonly ILocationInfoService _locationInfoService;
        private readonly IRepository<Dt_TakeStockOrder> _takeStockOrder;
        public InboundService(IUnitOfWorkManage unitOfWorkManage, IInboundOrderDetailService inboundOrderDetailService, IInboundOrderService inbounOrderService, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_LocationType> locationTypeRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IStockService stockService, IRepository<Dt_Task> taskRepository,IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, HttpClientHelper httpClientHelper, IRepository<Dt_MesReturnRecord> mesReturnRecord,ILocationInfoService locationInfoService,IRepository<Dt_TakeStockOrder> takeStockOrder)
        private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
        public InboundService(IUnitOfWorkManage unitOfWorkManage, IInboundOrderDetailService inboundOrderDetailService, IInboundOrderService inbounOrderService, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_LocationType> locationTypeRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IStockService stockService, IRepository<Dt_Task> taskRepository,IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, HttpClientHelper httpClientHelper, IRepository<Dt_MesReturnRecord> mesReturnRecord,ILocationInfoService locationInfoService,IRepository<Dt_TakeStockOrder> takeStockOrder,IRepository<Dt_StockInfoDetail> stockInfoDetailRepository)
        {
            _unitOfWorkManage = unitOfWorkManage;
            InboundOrderDetailService = inboundOrderDetailService;
@@ -71,6 +73,7 @@
            _mesReturnRecord = mesReturnRecord;
            _locationInfoService = locationInfoService;
            _takeStockOrder = takeStockOrder;
            _stockInfoDetailRepository = stockInfoDetailRepository;
        }

        public async Task<WebResponseContent> GroupPallet(GroupPalletDto palletDto)
@@ -117,7 +120,13 @@
                    d.SupplyCode,
                    d.WarehouseCode
                }).ToList();
                    return content.Error($"请确认条码{palletDto.Barcode}是否已经组盘",detail);   
                   var palletId = _stockInfoDetailRepository.QueryFirst(x => x.Barcode == palletDto.Barcode);
                    if (palletId == null)
                    {
                        return content.Error($"条码条码{palletDto.Barcode}不存在");
                    }
                    var pallet =_stockInfoRepository.QueryFirst(x => x.Id == palletId.StockId);
                    return content.Error($"条码{palletDto.Barcode}已经组到{pallet.PalletCode}",detail);   
                }
                inboundOrder = _inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Includes(x=>x.Details).Where(x => x.Id == details.First().OrderId).First();