From 34f1e65179910f3c02f0ac6813dbfefb4244d4d7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 15 四月 2026 19:23:24 +0800
Subject: [PATCH] feat(同步服务): 添加实例同步功能并优化更新逻辑
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs
index 2b27518..6b13364 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockSerivce.cs
@@ -1,4 +1,5 @@
锘縰sing SqlSugar;
+using WIDESEA_Common.Constants;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_DTO.MES;
@@ -123,12 +124,12 @@
var now = DateTime.Now;
var details = stock.Details.Select(item => new Dt_StockInfoDetail
{
- MaterielCode = "鐢佃姱",
- MaterielName = "鐢佃姱",
+ MaterielCode = StockConstants.MATERIAL_CODE,
+ MaterielName = StockConstants.MATERIAL_NAME,
StockQuantity = item.Quantity,
- Unit = "PCS",
- Creater = "system",
- OrderNo = "111",
+ Unit = StockConstants.UNIT,
+ Creater = StockConstants.SYSTEM_USER,
+ OrderNo = StockConstants.DEFAULT_ORDER_NO,
ProductionDate = now.ToString(),
EffectiveDate = now.AddYears(1).ToString(),
SerialNumber = item.CellBarcode,
@@ -139,10 +140,10 @@
var bindRequest = new BindContainerRequest
{
ContainerCode = stock?.TargetPalletNo,
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = StockConstants.MES_EQUIPMENT_CODE,
+ ResourceCode = StockConstants.MES_RESOURCE_CODE,
LocalTime = now,
- OperationType = 0, // 0浠ｈ〃缁勭洏
+ OperationType = StockConstants.MES_BIND_OPERATION_TYPE,
ContainerSfcList = details.Select(d => new ContainerSfcItem
{
Sfc = d.SerialNumber,
@@ -161,12 +162,18 @@
return result ? content.OK("缁勭洏鎴愬姛") : content.Error("缁勭洏澶辫触");
}
+ int WarehouseId = stock.Roadway switch
+ {
+ "娉ㄦ恫缁勭洏鏈烘鎵�" => (await _warehouseService.Db.Queryable<Dt_Warehouse>().FirstAsync(w => w.WarehouseCode == "GWSC1")).WarehouseId,
+ "鎹㈢洏鏈烘鎵�" => (await _warehouseService.Db.Queryable<Dt_Warehouse>().FirstAsync(w => w.WarehouseCode == "HCSC1")).WarehouseId
+ };
+
var entity = new Dt_StockInfo
{
PalletCode = stock.TargetPalletNo,
- WarehouseId = stock.Roadway == "娉ㄦ恫缁勭洏鏈烘鎵�" ? (await _warehouseService.Db.Queryable<Dt_Warehouse>().FirstAsync(w => w.WarehouseCode == "GW1")).WarehouseId : 0,
+ WarehouseId = WarehouseId,
StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.GetHashCode(),
- Creater = "system",
+ Creater = StockConstants.SYSTEM_USER,
Details = details
};
result = StockInfoService.Repository.AddData(entity, x => x.Details);
@@ -215,7 +222,7 @@
PalletCode = stock.TargetPalletNo,
WarehouseId = sourceStock.WarehouseId,
StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.GetHashCode(),
- Creater = "system",
+ Creater = StockConstants.SYSTEM_USER,
};
var newId = StockInfoService.Repository.AddData(newStock);
@@ -241,8 +248,8 @@
// 璋冪敤MES瑙ｇ粦婧愭墭鐩樼數鑺�
var unbindRequest = new UnBindContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = StockConstants.MES_EQUIPMENT_CODE,
+ ResourceCode = StockConstants.MES_RESOURCE_CODE,
LocalTime = DateTime.Now,
ContainCode = stock.SourcePalletNo,
SfcList = detailEntities.Select(d => d.SerialNumber).ToList()
@@ -261,10 +268,10 @@
var bindRequest = new BindContainerRequest
{
ContainerCode = stock.TargetPalletNo,
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = StockConstants.MES_EQUIPMENT_CODE,
+ ResourceCode = StockConstants.MES_RESOURCE_CODE,
LocalTime = DateTime.Now,
- OperationType = 0,
+ OperationType = StockConstants.MES_BIND_OPERATION_TYPE,
ContainerSfcList = detailEntities.Select(d => new ContainerSfcItem
{
Sfc = d.SerialNumber,
@@ -324,8 +331,8 @@
// 璋冪敤MES瑙ｇ粦鐢佃姱
var unbindRequest = new UnBindContainerRequest
{
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
+ EquipmentCode = StockConstants.MES_EQUIPMENT_CODE,
+ ResourceCode = StockConstants.MES_RESOURCE_CODE,
LocalTime = DateTime.Now,
ContainCode = stock.SourcePalletNo,
SfcList = detailEntities.Select(d => d.SerialNumber).ToList()
--
Gitblit v1.9.3