From c47acd2171faa2010384c57cd74c6ad1e415a13e Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 21 一月 2026 19:03:35 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/views/Home.vue | 40 ++++++++++++++++++++--------------------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs | 13 +++++++++++--
项目代码/WIDESEA_WMSClient/src/views/Index.vue | 2 +-
项目代码/WIDESEA_WMSClient/src/views/system/Sys_Dictionary.vue | 4 ++--
4 files changed, 34 insertions(+), 25 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Home.vue"
index 4189cf2..d941502 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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];
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Index.vue"
index eaa6fba..66a38ce 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Index.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/system/Sys_Dictionary.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/system/Sys_Dictionary.vue"
index 51df000..1ad9657 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/system/Sys_Dictionary.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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" },
],
[
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs"
index 2be3d60..5990115 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/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();
--
Gitblit v1.9.3