From 35530048d4e2c46f2c43f335f94d2176b21c9852 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 24 七月 2025 14:43:04 +0800
Subject: [PATCH] 最新代码上传，环线，WMS逻辑等
---
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 6
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 67 --
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile2.pubxml | 17
项目代码/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json | 1
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs | 24
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs | 43 +
项目代码/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs | 20
项目资料/通信协议/龙利得机器人IO通讯表20250712.xlsx | 0
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs | 1
项目代码/WMS/WMSServices/WIDESEA_OutboundRepository/OutboundRepository.cs | 4
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs | 9
项目代码/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs | 3
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPH.cs | 118 ++++
项目代码/WCS/WCSServices/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj | 2
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs | 23
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs | 917 ---------------------------------
项目资料/通信协议/物料编码规则20250618.xlsx | 0
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/W_CLineCPHDBName.cs | 29 +
项目代码/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs | 44 -
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 89 ---
项目资料/通信协议/龙利得设备通讯协议.xls | 0
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutboundService.cs | 14
项目代码/WCS/WCSServices/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj | 2
项目代码/WMS/WMSServices/WIDESEA_IOutboundService/IOutboundService.cs | 8
项目资料/通信协议/物料二维码规则.xlsx | 0
项目资料/通信协议/龙利得软件计划表.xlsx | 0
/dev/null | 19
项目代码/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs | 84 ---
项目代码/WMS/WMSServices/WIDESEA_IOutboundRepository/IOutboundRepository.cs | 2
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj | 3
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/R_CLineCPHDBName.cs | 49 +
项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 3
32 files changed, 276 insertions(+), 1,325 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj"
index c3531d3..268422a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj"
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.5" />
+ <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.9" />
</ItemGroup>
<ItemGroup>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 1f7f8a8..1c818f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -67,10 +67,11 @@
WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, string materielBoxCode = "");
/// <summary>
- /// 鍚慦MS鐢宠浠诲姟
+ /// 璇锋眰鍏ュ簱浠诲姟
/// </summary>
/// <param name="palletCode">鎵樼洏鍙�</param>
/// <param name="sourceAddress">璧峰鍦板潃</param>
+ /// /// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType = 630);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj"
index 23dc941..f6bc543 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj"
@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
- <PackageReference Include="WIDESEAWCS_Core" Version="1.0.13" />
+ <PackageReference Include="WIDESEAWCS_Core" Version="1.0.26" />
</ItemGroup>
<ItemGroup>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
index d8d1275..8b60d42 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
@@ -12,6 +12,7 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_Tasks;
+using static Dm.net.buffer.ByteArrayBuffer;
namespace WIDESEAWCS_Server.Controllers
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index 6bd97b1..8e1d69a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -108,8 +108,12 @@
return Service.ReceiveWMSTask(new List<WMSTaskDTO> { taskDTO });
}
/// <summary>
- /// 娴嬭瘯鍫嗗灈鏈哄叆搴�
+ /// 璇锋眰鍏ュ簱浠诲姟
/// </summary>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <param name="sourceAddress">璧峰鍦板潃</param>
+ /// <param name="roadWay">宸烽亾</param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("SCIN"), AllowAnonymous]
public WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay, int taskType = 0)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json"
index 76c3861..33aa85e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json"
@@ -10,6 +10,7 @@
"AllowedHosts": "*",
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
+ "DBType": "SqlServer",
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
index d698f98..200d3ac 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -324,11 +324,12 @@
return content;
}
- /// <summary>
- ///
+ // <summary>
+ /// 璇锋眰鍏ュ簱浠诲姟
/// </summary>
- /// <param name="palletCode"></param>
- /// <param name="sourceAddress"></param>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <param name="sourceAddress">璧峰鍦板潃</param>
+ /// /// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
public WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType=630)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
index 184d0b1..0036ea1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
@@ -76,6 +76,49 @@
[DataLength(10)]
public string PalletCode { get; set; }
}
+ public class R_CLineCPHInfo : DeviceCommand
+ {
+ /// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ public short R_ReadID { get; set; }
+ /// <summary>
+ /// 宸ヤ綅鐘舵��
+ /// 0:鑴辨満<br/>
+ /// 1:鎵嬪姩<br/>
+ /// 2:鑷姩<br/>
+ /// 3:鑷姩杩愯<br/>
+ /// 4:鏁呴殰<br/>
+ /// </summary>
+ public short R_State { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public int R_TaskNo { get; set; }
+ /// <summary>
+ /// 鐩殑鍦板潃
+ /// </summary>
+ public short R_TargetAddress { get; set; }
+ /// <summary>
+ /// 璇锋眰淇″彿
+ /// 0:鏃�<br/>
+ /// 1:浠诲姟璇锋眰<br/>
+ /// 2:璇锋眰缁撴潫<br/>
+ /// 3:浠诲姟娓呴櫎<br/>
+ /// 4:娓呴櫎缁撴潫<br/>
+ /// </summary>
+ public short R_Request { get; set; }
+ private string _barcode;
+ /// <summary>
+ /// 绠辩爜
+ /// </summary>
+ [DataLength(30)]
+ public string R_BoxCode
+ {
+ get { return _barcode; }
+ set { _barcode = value.Replace("\0", "").Replace("\\0", ""); }
+ }
+ }
public class R_RGVCPInfo : DeviceCommand
{
/// <summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/R_CLineCPHDBName.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/R_CLineCPHDBName.cs"
new file mode 100644
index 0000000..f9b360d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/R_CLineCPHDBName.cs"
@@ -0,0 +1,49 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_Tasks.ConveyorLineJob
+{
+ /// <summary>
+ /// 鎴愬搧鐜嚎璇诲彇鍛戒护
+ /// </summary>
+ public enum R_CLineCPHDB
+ {
+ /// <summary>
+ /// 宸ヤ綅鍙�
+ /// </summary>
+ R_ReadID,
+ /// <summary>
+ /// 宸ヤ綅鐘舵��
+ /// 0:鑴辨満<br/>
+ /// 1:鎵嬪姩<br/>
+ /// 2:鑷姩<br/>
+ /// 3:鑷姩杩愯<br/>
+ /// 4:鏁呴殰<br/>
+ /// </summary>
+ R_State,
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ R_TaskNo,
+ /// <summary>
+ /// 鐩殑鍦板潃
+ /// </summary>
+ R_TargetAddress,
+ /// <summary>
+ /// 璇锋眰淇″彿
+ /// 0:鏃�<br/>
+ /// 1:浠诲姟璇锋眰<br/>
+ /// 2:璇锋眰缁撴潫<br/>
+ /// 3:浠诲姟娓呴櫎<br/>
+ /// 4:娓呴櫎缁撴潫<br/>
+ /// </summary>
+ R_Request,
+ /// <summary>
+ /// 绠辩爜
+ /// </summary>
+ R_BoxCode
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/W_CLineCPHDBName.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/W_CLineCPHDBName.cs"
new file mode 100644
index 0000000..5a5167c
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/W_CLineCPHDBName.cs"
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEAWCS_Tasks.ConveyorLineJob
+{
+ /// <summary>
+ /// 鐜嚎鍐欏叆鍛戒护
+ /// </summary>
+ public enum W_CLineCPHDB
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ W_TaskNo,
+ /// <summary>
+ /// 鏍煎彛鍙�
+ /// </summary>
+ W_Channel,
+ /// <summary>
+ /// 璇锋眰纭<br/>
+ /// 1:浠诲姟涓嬪彂<br/>
+ /// 2:娓呴櫎纭<br/>
+ /// </summary>
+ W_Request
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
index 9be2027..7332b16 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj"
@@ -13,7 +13,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.5" />
+ <PackageReference Include="WIDESEAWCS_Communicator" Version="2.2.13" />
+ <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.9" />
</ItemGroup>
<ItemGroup>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
new file mode 100644
index 0000000..742eb6b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
@@ -0,0 +1,118 @@
+锘縰sing Microsoft.AspNetCore.Components.Routing;
+using Newtonsoft.Json;
+using Quartz;
+using SqlSugar.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.TaskEnum;
+using WIDESEAWCS_Communicator;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_IBasicInfoRepository;
+using WIDESEAWCS_ITaskInfoRepository;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob;
+using WIDESEAWCS_QuartzJob.DTO;
+using WIDESEAWCS_QuartzJob.Models;
+using WIDESEAWCS_QuartzJob.Repository;
+using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_Tasks.ConveyorLineJob;
+using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
+
+namespace WIDESEAWCS_Tasks
+{
+ [DisallowConcurrentExecution]
+ public class ConveyorLineJob_CPH : JobBase, IJob
+ {
+ private readonly ICacheService _cacheService;
+ private readonly ITaskService _taskService;
+ private readonly ITaskExecuteDetailService _taskExecuteDetailService;
+ private readonly ITaskRepository _taskRepository;
+ private readonly IStationMangerRepository _stationMangerRepository;
+ private readonly IRouterRepository _routerRepository;
+ private readonly IRouterService _routerService;
+ private readonly IRouterExtension _routerExtension;
+ private readonly List<Dt_WarehouseDevice> warehouseDevices;
+
+ public ConveyorLineJob_CPH(ICacheService cacheService, ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository, IRouterService routerService, IRouterExtension routerExtension)
+ {
+ _cacheService = cacheService;
+ _taskService = taskService;
+ _taskExecuteDetailService = taskExecuteDetailService;
+ _taskRepository = taskRepository;
+ _stationMangerRepository = stationMangerRepository;
+ _routerRepository = routerRepository;
+ _routerService = routerService;
+ _routerExtension = routerExtension;
+
+ string? warehouseDevicesStr = _cacheService.Get<string>(nameof(Dt_WarehouseDevice));
+ if (!string.IsNullOrEmpty(warehouseDevicesStr))
+ {
+ warehouseDevices = JsonConvert.DeserializeObject<List<Dt_WarehouseDevice>>(warehouseDevicesStr) ?? new List<Dt_WarehouseDevice>();
+ }
+ else
+ {
+ warehouseDevices = new List<Dt_WarehouseDevice>();
+ }
+ }
+
+ public Task Execute(IJobExecutionContext context)
+ {
+ bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
+ if (flag && value != null)
+ {
+ //鑾峰彇褰撳墠璁惧
+ OtherDevice device = (OtherDevice)value;
+ List<string> deviceStations = device.DeviceProDTOs.Select(x => x.DeviceChildCode).Distinct().ToList();
+ List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode);
+ foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode)))
+ {
+ DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(R_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(W_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ if (item.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt() && deviceProRead != null && deviceProWrite != null)
+ {
+ R_CLineCPHInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_CLineCPHInfo>(deviceProRead.DeviceProAddress);
+ //鐮佸灈鐜嚎璇锋眰浠诲姟
+ if (conveyorLineInfoRead != null && (conveyorLineInfoRead.R_State == 2 || conveyorLineInfoRead.R_State == 3) && conveyorLineInfoRead.R_TaskNo <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.R_BoxCode) && conveyorLineInfoRead.R_Request==1)
+ {
+ WebResponseContent content = _taskService.RequestWMSTaskSimple(conveyorLineInfoRead.R_BoxCode, item.StationCode);
+ //鍚慦MS璇锋眰浠诲姟
+ if (true)
+ {
+
+ }
+ }
+ }
+ else if(item.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt() && deviceProRead != null)
+ {
+ R_CLineCPHInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_CLineCPHInfo>(deviceProRead.DeviceProAddress);
+ //鑾峰彇鐮佸灈鍙ｄ换鍔℃洿鏂颁换鍔＄姸鎬�
+ if (conveyorLineInfoRead != null && (conveyorLineInfoRead.R_State == 2 || conveyorLineInfoRead.R_State == 3) && conveyorLineInfoRead.R_TaskNo > 0)
+ {
+
+ }
+ }
+ else if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && deviceProRead != null)
+ {
+ R_CLineCPHInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_CLineCPHInfo>(deviceProRead.DeviceProAddress);
+ //鐮佸灈鐜嚎鎺掑嚭鍙ｈ姹傚彇娑堜换鍔�
+ if (conveyorLineInfoRead != null && (conveyorLineInfoRead.R_State == 2 || conveyorLineInfoRead.R_State == 3) && conveyorLineInfoRead.R_TaskNo > 0 && conveyorLineInfoRead.R_Request == 2)
+ {
+
+ }
+ }
+ else
+ {
+ WriteError(item.StationName, $"鏈壘鍒拌澶囧瓙缂栧彿{item.StationCode}鐨勫崗璁俊鎭�");
+ }
+ }
+ }
+ return Task.CompletedTask;
+ }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/PPStockSelectViewDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/PPStockSelectViewDTO.cs"
deleted file mode 100644
index e0f5b7b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/PPStockSelectViewDTO.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Stock
-{
- public class PPStockSelectViewDTO
- {
- public string MaterielCode { get; set; }
-
- public string MaterielName { get; set; }
-
- public float UseableQuantity { get; set; }
-
- public string PalletCode { get; set; }
-
- public string LocationCode { get; set; }
-
- public string Unit { get; set; }
- public float CutedWidth { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/AGVService/InvokeAGVService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/AGVService/InvokeAGVService.cs"
deleted file mode 100644
index 2a9ecc8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/AGVService/InvokeAGVService.cs"
+++ /dev/null
@@ -1,98 +0,0 @@
-锘縰sing Autofac.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.APIEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.AGV;
-using WIDESEA_External.Model;
-
-namespace WIDESEA_External.AGVService
-{
- #region 寮冪敤
- public class InvokeAGVService : IInvokeAGVService
- {
- public static IInvokeAGVService Intance
- {
- get { return App.GetService<IInvokeAGVService>(); }
- }
- /// <summary>
- /// 鍙戦�丄GV浠诲姟
- /// </summary>
- /// <param name="taskModel"></param>
- /// <returns></returns>
- public WebResponseContent AgvSendTask(AgvTaskModel taskModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- string apiAddress = AppSettings.Get(APIEnum.AgvSendTask.ToString());
- string response = HttpHelper.Post(apiAddress, taskModel.Serialize());
- AgvResponseContent agvContent= response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code=="200")
- {
- content.OK(agvContent.Message);
- }
- else
- {
- content.Error(agvContent.Message);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 瀹夊叏淇″彿鐢宠 AGV-WMS-WCS
- /// </summary>
- public AgvResponseContent AgvSecureApply(AgvSecureApplyModel secureApplyModel)
- {
-
- return new AgvResponseContent();
- }
- /// <summary>
- /// 瀹夊叏淇″彿鍥炲 WMS-AGV
- /// </summary>
- /// <param name="secureModel"></param>
- /// <returns></returns>
- public WebResponseContent AgvSecureReply(AgvSecureReplyModel secureReplyModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- string apiAddress = AppSettings.Get(APIEnum.AgvSecureReply.ToString());
- string response = HttpHelper.Post(apiAddress, secureReplyModel.Serialize());
- AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
- if (agvContent.Code == "200")
- {
- content.OK(agvContent.Message);
- }
- else
- {
- content.Error(agvContent.Message);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// AGV浠诲姟鐘舵�佸埛鏂�
- /// </summary>
- /// <param name="agvUpdateModel"></param>
- /// <returns></returns>
- public AgvResponseContent AgvUpdateTask(AgvUpdateModel agvUpdateModel)
- {
-
- return new AgvResponseContent();
- }
- }
- #endregion
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/IAGVService/IInvokeAGVService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/IAGVService/IInvokeAGVService.cs"
deleted file mode 100644
index 79a57dc..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/IAGVService/IInvokeAGVService.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_DTO.AGV;
-using WIDESEA_External.Model;
-
-namespace WIDESEA_External.AGVService
-{
- #region 寮冪敤
- public interface IInvokeAGVService:IDependency
- {
- /// <summary>
- /// 鍙戦�丄GV浠诲姟
- /// </summary>
- /// <param name="taskModel"></param>
- /// <returns></returns>
- WebResponseContent AgvSendTask(AgvTaskModel taskModel);
- AgvResponseContent AgvSecureApply(AgvSecureApplyModel secureApplyModel);
- /// <summary>
- /// AGV瀹夊叏淇″彿鍥炲
- /// </summary>
- /// <returns></returns>
- WebResponseContent AgvSecureReply(AgvSecureReplyModel secureReplyModel);
- AgvResponseContent AgvUpdateTask(AgvUpdateModel agvUpdateModel);
- }
- #endregion
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvSecureApplyModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvSecureApplyModel.cs"
deleted file mode 100644
index ffa9a75..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvSecureApplyModel.cs"
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- public class AgvSecureApplyModel
- {
- /// <summary>
- /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜や娇鐢ㄥ悓涓�缂栧彿
- /// </summary>
- public string ReqCode { get; set; }
- /// <summary>
- /// 鐩爣浣�
- /// </summary>
- public string WbCode { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskCode { get; set; }
- /// <summary>
- /// 鎵规
- /// </summary>
- public string MaterialLot { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvSecureReplyModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvSecureReplyModel.cs"
deleted file mode 100644
index d6c3112..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvSecureReplyModel.cs"
+++ /dev/null
@@ -1,56 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- public class AgvSecureReplyModel
- {
- /// <summary>
- /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜�,浣跨敤鍚屼竴缂栧彿
- /// </summary>
- public string ReqCode { get; set; }
- /// <summary>
- /// 璇锋眰鏃堕棿 鏍煎紡:yyyy-MM-dd HH:mm:ss
- /// </summary>
- public string ReqTime { get; set; }
- /// <summary>
- /// 瀹㈡埛绔紪鍙�
- /// </summary>
- public string ClientCode { get; set; }
- /// <summary>
- /// 浠ょ墝鍙� 鐢辫皟搴︾郴缁熼鍙�
- /// </summary>
- public string TokenCode { get; set; }
- /// <summary>
- /// 宸ヤ綔浣� 涓嶳CS-2000绔厤缃殑浣嶇疆鍚嶇О涓�鑷�
- /// </summary>
- public string WbCode { get; set; }
- /// <summary>
- /// 杞藉叿缂栧彿
- /// </summary>
- public string podCode { get; set; }
- /// <summary>
- /// AGV缂栧彿
- /// </summary>
- public string agvCode { get; set; }
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string taskCode { get; set; }
- /// <summary>
- /// 涓嬩竴涓瓙浠诲姟搴忓垪 鎸囧畾绗嚑涓瓙浠诲姟寮�濮嬫墽琛�,鏍￠獙瀛愪换鍔℃墽琛屾槸鍚︽纭�,涓嶅～榛樿鎵ц涓嬩竴涓瓙浠诲姟銆�
- /// </summary>
- public string taskSeq { get; set; }
- /// <summary>
- /// 涓嬩竴涓綅缃俊鎭�
- /// positionCode:浣嶇疆缂栧彿
- /// type:瀵硅薄绫诲瀷瀹氫箟:
- /// 00:浠ｈ〃 nextPositionCode鏄竴涓綅缃�
- /// 02:浠ｈ〃 nextPositionCode鏄竴涓瓥鐣�
- /// </summary>
- public object nextPositionCode { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvTaskModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvTaskModel.cs"
deleted file mode 100644
index de9f3a9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvTaskModel.cs"
+++ /dev/null
@@ -1,72 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// AGV浠诲姟
- /// </summary>
- public class AgvTaskModel
- {
- /// <summary>
- /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜�,浣跨敤鍚屼竴缂栧彿
- /// </summary>
- public string ReqCode { get; set; }
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public string TaskTyp { get; set; }
- /// <summary>
- /// 宸ヤ綔浣�
- /// </summary>
- public string WbCode { get; set; }
- /// <summary>
- /// 浣嶇疆璺緞
- /// </summary>
- public List<object> PositionCodePath { get; set; }
- /// <summary>
- /// 杞藉叿缂栧彿
- /// </summary>
- public string PodCode { get; set; }
- /// <summary>
- /// 杞藉叿绫诲瀷
- /// </summary>
- public string PodTyp { get; set; }
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- /// 浼樺厛绾�(1~127)鏈�澶т紭鍏堢骇鏈�楂� 涓虹┖鏃�,閲囩敤浠诲姟妯℃澘鐨勪紭鍏堢骇
- /// </summary>
- public string Priority { get; set; }
- /// <summary>
- /// AGV浠诲姟鍙�
- /// </summary>
- public string TaskCode { get; set; }
- /// <summary>
- /// AGV璁惧缂栧彿 濉啓鍙寚瀹氭煇涓�缂栧彿鐨凙GV鎵ц璇ヤ换鍔�
- /// </summary>
- public string AgvCode { get; set; }
- /// <summary>
- /// AGV璁惧绫诲瀷
- /// </summary>
- public string AgvTyp { get; set; }
- /// <summary>
- /// 鍖哄煙/绛栫暐<br/>
- /// 鎸戦�夎揣鏋朵互鍙婃牴鎹墿鏂欐壒娆℃寫閫夎揣鏋舵椂鐨勫厛杩涘厛鍑鸿鍒欙紝鏀寔浠ヤ笅4涓�硷細<br/>
- /// 1锛氭寜鐓ц揣鏋跺埌杈惧偍浣嶇殑鏃堕棿椤哄簭锛屽厛杩涘厛鍑�<br/>
- /// 2锛氭寜鐓ц揣鏋跺埌杈惧偍浣嶇殑鏃堕棿椤哄簭锛屽厛杩涘悗鍑�<br/>
- /// 9锛氭寜鐓ц揣鏋剁粦瀹氱墿鏂欐壒娆＄殑鏃堕棿椤哄簭锛屽厛杩涘厛鍑�<br/>
- /// 10锛氭寜鐓ц揣鏋剁粦瀹氱墿鏂欐壒娆＄殑鏃堕棿椤哄簭锛屽厛杩涘悗鍑�<br/>
- /// </summary>
- public string PositionSelStrategy { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�
- /// </summary>
- public string Data { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvUpdateModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvUpdateModel.cs"
deleted file mode 100644
index e6f0e7d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/AgvUpdateModel.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- public class AgvUpdateModel
- {
- /// <summary>
- /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜や娇鐢ㄥ悓涓�缂栧彿
- /// </summary>
- public string ReqCode { get; set; }
- /// <summary>
- /// 璇锋眰鏃堕棿 鏍煎紡:yyyy-MM-dd HH:mm:ss
- /// </summary>
- public string ReqTime { get; set; }
- /// <summary>
- /// 浣嶇疆X鍧愭爣 浠诲姟瀹屾垚鏃舵湁鍊�
- /// </summary>
- public int CooX { get; set; }
- /// <summary>
- /// 浣嶇疆Y鍧愭爣 浠诲姟瀹屾垚鏃舵湁鍊�
- /// </summary>
- public int CooY { get; set; }
- /// <summary>
- /// 褰撳墠浣嶇疆缂栧彿<br/>
- /// 浠诲姟寮�濮嬶細璇ヤ綅缃负浠诲姟璧风偣<br/>
- /// 璧板嚭鍌ㄤ綅锛氳浣嶇疆涓轰换鍔¤捣鐐�<br/>
- /// 浠诲姟鍗曞彇娑堬細璇ヤ綅缃负宸ヤ綔浣嶇紪鍙�<br/>
- /// 浠诲姟缁撴潫锛氳浣嶇疆涓轰换鍔＄粓鐐�<br/>
- /// 鍙栨斁鐢宠锛氬彇鏀炬枡绠辩殑鐐�<br/>
- /// </summary>
- public string CurrentPositionCode { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�
- /// </summary>
- public string Data { get; set; }
- /// <summary>
- /// 鍦板浘缂栧彿
- /// </summary>
- public string MapCode { get; set; }
- /// <summary>
- /// 鍦扮爜缂栧彿 浠诲姟瀹屾垚鏃舵湁鍊�
- /// </summary>
- public string MapDataCode { get; set; }
- /// <summary>
- /// 浠撲綅缂栫爜 鍙夎溅涓嶤TU浠诲姟鏃舵湁鍊�
- /// </summary>
- public string StgBinCode { get; set; }
- /// <summary>
- /// 鏂规硶鍚�<br/>
- /// start : 浠诲姟寮�濮�<br/>
- /// outbin : 璧板嚭鍌ㄤ綅<br/>
- /// end : 浠诲姟缁撴潫<br/>
- /// cancel : 浠诲姟鍗曞彇娑�<br/>
- /// apply锛欳TU鏂欑鍙栨斁鐢宠<br/>
- /// </summary>
- public string Method { get; set; }
- /// <summary>
- /// 杞藉叿缂栧彿
- /// </summary>
- public string PodCode { get; set; }
- /// <summary>
- /// 杞藉叿鏂瑰悜
- /// </summary>
- public string PodDir { get; set; }
- /// <summary>
- /// 鐗╂枡鎵规鍙�
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
- public string MaterialType { get; set; }
- /// <summary>
- /// AGV缂栧彿
- /// </summary>
- public string RobotCode { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskCode { get; set; }
- /// <summary>
- /// 宸ヤ綔鍙扮紪鍙� 浠诲姟瀹屾垚鏃舵湁鍊�,涓庣敓鎴愪换鍔″崟鎺ュ彛涓殑wbCode涓�鑷�
- /// </summary>
- public string WbCode { get; set; }
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public string CtnrCode { get; set; }
- /// <summary>
- /// 瀹瑰櫒绫诲瀷
- /// </summary>
- public string CtnrType { get; set; }
- /// <summary>
- /// 宸烽亾缂栧彿
- /// </summary>
- public string RoadWayCode { get; set; }
- /// <summary>
- /// 宸烽亾鍐呴『搴忓彿<br/>
- /// 宸烽亾灏炬槸0渚濇鍒板贩閬撳ご渚濇閫掑1
- /// </summary>
- public string Seq { get; set; }
- /// <summary>
- /// 璁惧缂栧彿
- /// </summary>
- public string EqpCode { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundRepository/IMesPPBackInboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundRepository/IMesPPBackInboundOrderDetailRepository.cs"
deleted file mode 100644
index 2808560..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundRepository/IMesPPBackInboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IInboundRepository
-{
- public interface IMesPPBackInboundOrderDetailRepository : IRepository<Dt_MesPPBackInboundOrderDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundRepository/IMesPPBackInboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundRepository/IMesPPBackInboundOrderRepository.cs"
deleted file mode 100644
index a3662ad..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundRepository/IMesPPBackInboundOrderRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IInboundRepository
-{
- public interface IMesPPBackInboundOrderRepository : IRepository<Dt_MesPPBackInboundOrder>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundService/IMesPPBackInboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundService/IMesPPBackInboundOrderDetailService.cs"
deleted file mode 100644
index da5535f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundService/IMesPPBackInboundOrderDetailService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IInboundService
-{
- public interface IMesPPBackInboundOrderDetailService : IService<Dt_MesPPBackInboundOrderDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundService/IMesPPBackInboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundService/IMesPPBackInboundOrderService.cs"
deleted file mode 100644
index de52bf3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IInboundService/IMesPPBackInboundOrderService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IInboundService
-{
- public interface IMesPPBackInboundOrderService : IService<Dt_MesPPBackInboundOrder>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPCutOutboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPCutOutboundOrderDetailRepository.cs"
deleted file mode 100644
index cc3f87e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPCutOutboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundRepository
-{
- public interface IMesPPCutOutboundOrderDetailRepository : IRepository<Dt_MesPPCutOutboundOrderDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPCutOutboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPCutOutboundOrderRepository.cs"
deleted file mode 100644
index 0a8c3db..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPCutOutboundOrderRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundRepository
-{
- public interface IMesPPCutOutboundOrderRepository : IRepository<Dt_MesPPCutOutboundOrder>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPOutboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPOutboundOrderDetailRepository.cs"
deleted file mode 100644
index 92150c9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPOutboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundRepository
-{
- public interface IMesPPOutboundOrderDetailRepository : IRepository<Dt_MesPPOutboundOrderDetail>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPOutboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPOutboundOrderRepository.cs"
deleted file mode 100644
index fb0d95d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IMesPPOutboundOrderRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundRepository
-{
- public interface IMesPPOutboundOrderRepository : IRepository<Dt_MesPPOutboundOrder>
- {
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IOutboundRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IOutboundRepository.cs"
index 9ed3de3..bf013c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IOutboundRepository.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundRepository/IOutboundRepository.cs"
@@ -14,8 +14,6 @@
IOutboundOrderRepository OutboundOrderRepository { get; }
IOutStockLockInfoRepository OutboundStockLockInfoRepository { get; }
-
- IMesPPCutOutboundOrderRepository MesPPCutOutboundOrderRepository { get; }
IProOutOrderRepository ProOutOrderRepository { get; }
IProOutOrderDetailRepository ProOutOrderDetailRepository { get; }
IMesRworkOutboundOrderRepository RworkOutboundOrderRepository { get; }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPCutOutboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPCutOutboundOrderDetailService.cs"
deleted file mode 100644
index d9c1538..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPCutOutboundOrderDetailService.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundService
-{
- public interface IMesPPCutOutboundOrderDetailService : IService<Dt_MesPPCutOutboundOrderDetail>
- {
- IMesPPCutOutboundOrderDetailRepository Repository { get; }
-
- (List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(Dt_MesPPCutOutboundOrderDetail mesOutboundOrder,List<PPStockSelectViewDTO> stockSelectViewDTOs);
-
- /// <summary>
- /// 閿佸畾鍑哄簱搴撳瓨(淇敼鏁版嵁)
- /// </summary>
- /// <param name="stockInfos">搴撳瓨鏄庣粏闆嗗悎</param>
- /// <param name="outboundOrderDetails">鍑哄簱鍗曟槑缁嗛泦鍚�</param>
- /// <param name="outStockLockInfos">鍑哄簱閿佸畾鏄庣粏闆嗗悎</param>
- /// <param name="locationInfos">璐т綅缁撳悎</param>
- /// <param name="locationStatus">璐т綅鐘舵�佷慨鏀圭殑鍊�</param>
- /// <param name="tasks">浠诲姟淇℃伅</param>
- /// <returns></returns>
- WebResponseContent LockOutboundStockDataUpdate(List<Dt_StockInfo> stockInfos, List<Dt_MesPPCutOutboundOrderDetail> outboundOrderDetails, List<Dt_OutStockLockInfo> outStockLockInfos, List<Dt_LocationInfo> locationInfos, LocationStatusEnum locationStatus = LocationStatusEnum.Lock, List<Dt_Task>? tasks = null);
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPCutOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPCutOutboundOrderService.cs"
deleted file mode 100644
index f7f7656..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPCutOutboundOrderService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundService
-{
- public interface IMesPPCutOutboundOrderService : IService<Dt_MesPPCutOutboundOrder>
- {
- IMesPPCutOutboundOrderRepository Repository { get; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPOutboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPOutboundOrderDetailService.cs"
deleted file mode 100644
index 1cf3fa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPOutboundOrderDetailService.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundService
-{
- public interface IMesPPOutboundOrderDetailService : IService<Dt_MesPPOutboundOrderDetail>
- {
- IMesPPOutboundOrderDetailRepository Repository { get; }
-
- (List<Dt_StockInfo>, List<Dt_MesPPOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>, Dt_MesPPOutboundOrder mesPPOutboundOrder) AssignStockOutbound(List<Dt_MesPPOutboundOrderDetail> mesOutboundOrder);
-
- /// <summary>
- /// 閿佸畾鍑哄簱搴撳瓨(淇敼鏁版嵁)
- /// </summary>
- /// <param name="stockInfos">搴撳瓨鏄庣粏闆嗗悎</param>
- /// <param name="outboundOrderDetails">鍑哄簱鍗曟槑缁嗛泦鍚�</param>
- /// <param name="outStockLockInfos">鍑哄簱閿佸畾鏄庣粏闆嗗悎</param>
- /// <param name="locationInfos">璐т綅缁撳悎</param>
- /// <param name="locationStatus">璐т綅鐘舵�佷慨鏀圭殑鍊�</param>
- /// <param name="tasks">浠诲姟淇℃伅</param>
- /// <returns></returns>
- WebResponseContent LockOutboundStockDataUpdate(Dt_MesPPOutboundOrder mesPPOutboundOrder,List<Dt_StockInfo> stockInfos, List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails, List<Dt_OutStockLockInfo> outStockLockInfos, List<Dt_LocationInfo> locationInfos, LocationStatusEnum locationStatus = LocationStatusEnum.Lock, List<Dt_Task>? tasks = null);
-
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPOutboundOrderService.cs"
deleted file mode 100644
index 6974ddd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IMesPPOutboundOrderService.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundService
-{
- public interface IMesPPOutboundOrderService : IService<Dt_MesPPOutboundOrder>
- {
- IMesPPOutboundOrderRepository Repository { get; }
-
- //(List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(Dt_MesPPOutboundOrder mesOutboundOrder);
-
- //(List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(Dt_MesPPCutOutboundOrder mesPPOutboundOrder, Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail);
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
index 822d536..243e1ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
@@ -51,26 +51,6 @@
Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesOutboundOrder mesOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null);
/// <summary>
- /// PP灏忓嵎鍑哄簱
- /// </summary>
- /// <param name="mesOutboundOrder"></param>
- /// <param name="outStock"></param>
- /// <param name="assignQuantity"></param>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder,Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail, List<Dt_StockInfo> outStock, int? taskNum = null);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="mesOutboundOrder"></param>
- /// <param name="outStock"></param>
- /// <param name="assignQuantity"></param>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null);
-
- /// <summary>
///
/// </summary>
/// <param name="orderDetailId"></param>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutboundService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutboundService.cs"
index 991ad73..1b28791 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutboundService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutboundService.cs"
@@ -16,14 +16,6 @@
IOutboundOrderService OutboundOrderService { get; }
IOutStockLockInfoService OutboundStockLockInfoService { get; }
-
- IMesPPOutboundOrderService MesPPOutboundOrderService { get; }
-
- IMesPPOutboundOrderDetailService MesPPOutboundOrderDetailService { get; }
-
- IMesPPCutOutboundOrderService MesPPCutOutboundOrderService { get; }
-
- IMesPPCutOutboundOrderDetailService MesPPCutOutboundOrderDetailService { get; }
IProOutOrderService ProOutOrderService { get; }
IProOutOrderDetailService ProOutOrderDetailService { get; }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockRepository/ISolderMaskStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockRepository/ISolderMaskStockRepository.cs"
deleted file mode 100644
index ca15265..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockRepository/ISolderMaskStockRepository.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockRepository
-{
- public interface ISolderMaskStockRepository : IRepository<Dt_SolderMaskStock>
- {
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockRepository/ISolderMaskStock_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockRepository/ISolderMaskStock_HtyRepository.cs"
deleted file mode 100644
index 491fe24..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockRepository/ISolderMaskStock_HtyRepository.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockRepository
-{
- public interface ISolderMaskStock_HtyRepository : IRepository<Dt_SolderMaskStock_Hty>
- {
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/ISolderMaskStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/ISolderMaskStockService.cs"
deleted file mode 100644
index 8155094..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/ISolderMaskStockService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockService
-{
- public interface ISolderMaskStockService : IService<Dt_SolderMaskStock>
- {
- ISolderMaskStockRepository Repository { get; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/ISolderMaskStock_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/ISolderMaskStock_HtyService.cs"
deleted file mode 100644
index d4bb48f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/ISolderMaskStock_HtyService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockService
-{
- public interface ISolderMaskStock_HtyService : IService<Dt_SolderMaskStock_Hty>
- {
- ISolderMaskStock_HtyRepository Repository { get; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
index 2533a8d..890e8c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
@@ -26,8 +26,5 @@
List<Dt_StockInfo> GetUseableStocks(string materielCode, string batchNo, string palletcode, int warehoseId);
WebResponseContent StockQueryData(SaveModel saveModel);
-
- List<PPStockSelectViewDTO> PPGetStockSelectViews(int orderId, string materielCode);
- List<PPStockSelectViewDTO> PPGetPKStockSelectViews(int orderId, string materielCode);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
index aa30edb..a94089f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -226,33 +226,6 @@
MesResponseContent SubstrateBack(SubstrateBackModel model);
/// <summary>
- /// PP澶у嵎鍑哄簱-杩涜鍒嗗嵎
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent PPSubsectionOut(PPSubsectionOutModel model);
-
- /// <summary>
- /// PP灏忓嵎鍑哄簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent PPCutOut(PPCutOutModle model);
-
- /// <summary>
- /// PP鍏ュ簱(澶у嵎銆佸皬鍗枫�佸紶鏂�)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent PPBack(PPBackModel model);
- /// <summary>
- /// PP搴撳瓨鏌ヨ
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent QueryPpByWidth(QueryPpByWidthModel model);
-
- /// <summary>
/// 鎴愬搧杩斿伐鎻愬簱
/// </summary>
/// <param name="model"></param>
@@ -331,23 +304,6 @@
/// </summary>
/// <returns></returns>
WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
- /// <summary>
- /// 鐢熸垚MESPP澶у嵎鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- WebResponseContent MESPPGenerateOutboundTasks(int[] keys);
-
- /// <summary>
- /// 鐢熸垚MESPP灏忓嵎鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- //WebResponseContent PPCutOutGenerateOutboundTasks(int[] keys);
-
- WebResponseContent PPCutOutGenerateOutboundTasks(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews);
-
- WebResponseContent PPGeneratePKOutboundTask(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews);
/// <summary>
/// 鐢熸垚鎴愬搧鍑哄簱浠诲姟
/// </summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundRepository/MesPPBackInboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundRepository/MesPPBackInboundOrderDetailRepository.cs"
deleted file mode 100644
index dbbc422..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundRepository/MesPPBackInboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IInboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_InboundRepository
-{
- public class MesPPBackInboundOrderDetailRepository : RepositoryBase<Dt_MesPPBackInboundOrderDetail>, IMesPPBackInboundOrderDetailRepository
- {
- public MesPPBackInboundOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundRepository/MesPPBackInboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundRepository/MesPPBackInboundOrderRepository.cs"
deleted file mode 100644
index 34589d5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundRepository/MesPPBackInboundOrderRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IInboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_InboundRepository
-{
- public class MesPPBackInboundOrderRepository : RepositoryBase<Dt_MesPPBackInboundOrder>, IMesPPBackInboundOrderRepository
- {
- public MesPPBackInboundOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MesPPBackInboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MesPPBackInboundOrderDetailService.cs"
deleted file mode 100644
index 6eda54a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MesPPBackInboundOrderDetailService.cs"
+++ /dev/null
@@ -1,37 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IInboundRepository;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_InboundService
-{
- public class MesPPBackInboundOrderDetailService : ServiceBase<Dt_MesPPBackInboundOrderDetail, IMesPPBackInboundOrderDetailRepository>, IMesPPBackInboundOrderDetailService
- {
- private readonly IBasicRepository _basicRepository;
- private readonly IStockService _stockService;
- private readonly IOutStockLockInfoService _outStockLockInfoService;
- private readonly IBasicService _basicService;
- private readonly IRecordService _recordService;
-
- public IMesPPBackInboundOrderDetailRepository Repository => BaseDal;
-
- public MesPPBackInboundOrderDetailService(IMesPPBackInboundOrderDetailRepository BaseDal, IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- _stockService = stockService;
- _outStockLockInfoService = outStockLockInfoService;
- _basicService = basicService;
- _recordService = recordService;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MesPPBackInboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MesPPBackInboundOrderService.cs"
deleted file mode 100644
index 01fb2c0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MesPPBackInboundOrderService.cs"
+++ /dev/null
@@ -1,38 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IInboundRepository;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_InboundService
-{
- public class MesPPBackInboundOrderService : ServiceBase<Dt_MesPPBackInboundOrder, IMesPPBackInboundOrderRepository>, IMesPPBackInboundOrderService
- {
- private readonly IBasicRepository _basicRepository;
- private readonly IStockService _stockService;
- private readonly IOutStockLockInfoService _outStockLockInfoService;
- private readonly IBasicService _basicService;
- private readonly IRecordService _recordService;
-
- public IMesPPBackInboundOrderRepository Repository => BaseDal;
-
- public MesPPBackInboundOrderService(IMesPPBackInboundOrderRepository BaseDal, IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- _stockService = stockService;
- _outStockLockInfoService = outStockLockInfoService;
- _basicService = basicService;
- _recordService = recordService;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MesPPBackInboundOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MesPPBackInboundOrder.cs"
deleted file mode 100644
index 847fda2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MesPPBackInboundOrder.cs"
+++ /dev/null
@@ -1,79 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// PP鍏ュ簱鍗�
- /// </summary>
- [SugarTable(nameof(Dt_MesPPBackInboundOrder), "PP鍏ュ簱鍗�")]
- public class Dt_MesPPBackInboundOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.InboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
- public string InboundOrderNo { get; set; }
- /// <summary>
- /// 鍘熷湴鍧�鐮�
- /// </summary>
- //[CodeRule(RuleCodeEnum.InboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍘熷湴鍧�鐮�")]
- public string SourceAddressCode { get; set; }
- /// <summary>
- /// 杞藉叿鍙�
- /// </summary>
- //[CodeRule(RuleCodeEnum.InboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞藉叿鍙�")]
- public string CarrierCode { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷")]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鐘舵��")]
- public int OrderStatus { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏂瑰紡
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏂瑰紡")]
- public int CreateType { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁�
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_MesPPBackInboundOrderDetail.OrderId), nameof(Id))]
- public List<Dt_MesPPBackInboundOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MesPPBackInboundOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MesPPBackInboundOrderDetail.cs"
deleted file mode 100644
index def97e2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MesPPBackInboundOrderDetail.cs"
+++ /dev/null
@@ -1,117 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// PP鍏ュ簱鍗曟槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_MesPPBackInboundOrderDetail), "PP鍏ュ簱鍗曟槑缁�"), ModelValidate]
- public class Dt_MesPPBackInboundOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曚富閿�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍏ュ簱鍗曚富閿�")]
- public int OrderId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规鍙�")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
- public string MaterielSpec { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public float OrderQuantity { get; set; }
-
- /// <summary>
- /// 缁勭洏鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "缁勭洏鏁伴噺", DefaultValue = "0")]
- public float ReceiptQuantity { get; set; }
-
- /// <summary>
- /// 涓婃灦鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "涓婃灦鏁伴噺", DefaultValue = "0")]
- public float OverInQuantity { get; set; }
-
- /// <summary>
- /// 璁㈠崟鏄庣粏鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
- public int OrderDetailStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鏀惰揣鍗曟槑缁嗚鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏀惰揣鍗曟槑缁嗚鍙�")]
- public int RowNo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- /// <summary>
- /// 瑁佸垏瀹�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "瑁佸垏瀹�")]
- public float CutedWidth { get; set; }
- /// <summary>
- /// 鍘熺墿鏂欐壒娆″彿
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍘熺墿鏂欐壒娆″彿")]
- public string MaterialLotOld { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐢熶骇鏃ユ湡")]
- public string ProductionDate { get; set; }
- /// <summary>
- /// 鏈夋晥鏃ユ湡
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鏈夋晥鏃ユ湡")]
- public string EffectiveDate { get; set; }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPCutOutboundOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPCutOutboundOrder.cs"
deleted file mode 100644
index 0e0bbde..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPCutOutboundOrder.cs"
+++ /dev/null
@@ -1,68 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// PP浠撳皬鍗稭ES鍑哄簱鍗�
- /// </summary>
- [SugarTable(nameof(Dt_MesPPCutOutboundOrder))]
- public class Dt_MesPPCutOutboundOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.OutboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "浠诲姟鍗曞彿")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷", IsOnlyIgnoreUpdate = true)]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鐘舵��")]
- public int OrderStatus { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏂瑰紡
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏂瑰紡", IsOnlyIgnoreUpdate = true)]
- public int CreateType { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曟槑缁�
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_MesPPCutOutboundOrderDetail.OrderId), nameof(Id))]
- public List<Dt_MesPPCutOutboundOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPCutOutboundOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPCutOutboundOrderDetail.cs"
deleted file mode 100644
index cbdfe2a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPCutOutboundOrderDetail.cs"
+++ /dev/null
@@ -1,106 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// PP浠撳皬鍗稭ES鍑哄簱鍗曟槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_MesPPCutOutboundOrderDetail), "PP浠撳皬鍗稭ES鍑哄簱鍗曟槑缁�")]
- public class Dt_MesPPCutOutboundOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曚富閿�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鍗曚富閿�")]
- public int OrderId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵规鍙�")]
- public string BatchNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public float OrderQuantity { get; set; }
-
- /// <summary>
- /// 閿佸畾鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閿佸畾鏁伴噺", DefaultValue = "0")]
- public float LockQuantity { get; set; }
-
- /// <summary>
- /// 宸插嚭鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸插嚭鏁伴噺", DefaultValue = "0")]
- public float OverOutQuantity { get; set; }
-
- /// <summary>
- /// 璁㈠崟鏄庣粏鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
- public int OrderDetailStatus { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 灞傚埆
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "灞傚埆")]
- public string LayerCode { get; set; }
-
- /// <summary>
- /// 搴忓垪
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴忓垪")]
- public int Sequence { get; set; }
-
- /// <summary>
- /// 瑁佸垏瀹�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "瑁佸垏瀹�")]
- public float Width { get; set; }
-
- /// <summary>
- /// 绾胯竟浠撳湴鍧�鐮�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "绾胯竟浠撳湴鍧�鐮�")]
- public string TargetAddressCode { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPOutboundOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPOutboundOrder.cs"
deleted file mode 100644
index 1a15de0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPOutboundOrder.cs"
+++ /dev/null
@@ -1,123 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// PP浠撳ぇ鍗稭ES鍑哄簱鍗�
- /// </summary>
- [SugarTable(nameof(Dt_MesPPOutboundOrder))]
- public class Dt_MesPPOutboundOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.OutboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "浠诲姟鍗曞彿")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷", IsOnlyIgnoreUpdate = true)]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鐘舵��")]
- public int OrderStatus { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏂瑰紡
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏂瑰紡", IsOnlyIgnoreUpdate = true)]
- public int CreateType { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public float OrderQuantity { get; set; }
-
- /// <summary>
- /// 閿佸畾鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閿佸畾鏁伴噺", DefaultValue = "0")]
- public float LockQuantity { get; set; }
-
- /// <summary>
- /// 宸插嚭鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸插嚭鏁伴噺", DefaultValue = "0")]
- public float OverOutQuantity { get; set; }
-
- /// <summary>
- /// 绾夸綋
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "绾夸綋")]
- public string Line { get; set; }
-
- /// <summary>
- /// 绾胯竟浠撳湴鍧�鐮�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "绾胯竟浠撳湴鍧�鐮�")]
- public string TargetAddressCode { get; set; }
-
- /// <summary>
- /// 瑁佸垏瀹�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "瑁佸垏瀹�")]
- public float Width { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曟槑缁�
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_MesPPOutboundOrderDetail.OrderId), nameof(Id))]
- public List<Dt_MesPPOutboundOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPOutboundOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPOutboundOrderDetail.cs"
deleted file mode 100644
index ceef524..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_MesPPOutboundOrderDetail.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// PP浠撳ぇ鍗稭ES鍑哄簱鍗曟槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_MesPPOutboundOrderDetail), "PP浠撳ぇ鍗稭ES鍑哄簱鍗曟槑缁�")]
- public class Dt_MesPPOutboundOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int OrderId { get; set; }
-
- /// <summary>
- /// 搴撳尯
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "搴撳尯")]
- public string Warehouse { get; set; }
-
- /// <summary>
- /// 杞藉叿鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞藉叿鍙�")]
- public string CarrierCode { get; set; }
- /// <summary>
- /// 璁㈠崟鏄庣粏鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
- public int OrderDetailStatus { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProSpecifyVerOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProSpecifyVerOrder.cs"
deleted file mode 100644
index 1badfd6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProSpecifyVerOrder.cs"
+++ /dev/null
@@ -1,81 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鎴愬搧閿�鍞寚娲惧崟
- /// </summary>
- [SugarTable(nameof(Dt_ProSpecifyVerOrder), "鎴愬搧閿�鍞寚娲惧崟")]
- public class Dt_ProSpecifyVerOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閿�鍞鍗曞彿")]
- public string ProSaleOrderNo { get; set; }
-
- /// <summary>
- /// 鏄庣粏琛屽彿
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄庣粏琛屽彿")]
- public int RowId { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = false,Length =50, ColumnDescription = "浜у搧缂栫爜")]
- public string PCode { get; set; }
-
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "浜у搧鐗堟湰")]
- public string PVer { get; set; }
-
- /// <summary>
- /// 浜у搧鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "浜у搧鎵规")]
- public string PLot { get; set; }
-
- /// <summary>
- /// 浜у搧鍛ㄦ湡
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "浜у搧鍛ㄦ湡")]
- public string DateCode { get; set; }
-
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍚堟牸PCS鏁�")]
- public float QtyQcs { get; set; }
- /// <summary>
- /// 鎸囨淳鐗堟湰鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎸囨淳鐗堟湰鍙�")]
- public string Ver { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_SolderMaskStock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_SolderMaskStock.cs"
deleted file mode 100644
index 1476444..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_SolderMaskStock.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-using SqlSugar;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 闃荤剨搴撳瓨淇℃伅
- /// </summary>
- [SugarTable(nameof(Dt_SolderMaskStock), "闃荤剨搴撳瓨淇℃伅")]
- public class Dt_SolderMaskStock : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
- /// <summary>
- /// 鏂欏彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏂欏彿")]
- public string Product { get; set; }
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗堟湰")]
- public string ProductVersion { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public float Qty { get; set; }
- /// <summary>
- /// 鍛ㄦ湡
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍛ㄦ湡")]
- public string DateCode { get; set; }
- /// <summary>
- /// 鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规")]
- public string LotNo { get; set; }
- /// <summary>
- /// 鏄惁婊ot
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁婊ot")]
- public int IsFullNumber { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_SolderMaskStock_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_SolderMaskStock_Hty.cs"
deleted file mode 100644
index 8e2408c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_SolderMaskStock_Hty.cs"
+++ /dev/null
@@ -1,44 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 闃荤剨搴撳瓨淇℃伅鍘嗗彶
- /// </summary>
- [SugarTable(nameof(Dt_SolderMaskStock_Hty), "闃荤剨搴撳瓨淇℃伅鍘嗗彶")]
- public class Dt_SolderMaskStock_Hty : Dt_SolderMaskStock, IBaseHistoryEntity
- {
- /// <summary>
- /// 鍘熻〃涓婚敭
- /// </summary>
- [ImporterHeader(Name = "鍘熻〃涓婚敭")]
- [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")]
- [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")]
- public int SourceId { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
- [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; }
-
- /// <summary>
- /// 绉诲叆鍘嗗彶鏃堕棿
- /// </summary>
- [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")]
- [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")]
- [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")]
- public DateTime InsertTime { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPCutOutboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPCutOutboundOrderDetailRepository.cs"
deleted file mode 100644
index 403271c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPCutOutboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_OutboundRepository
-{
- public class MesPPCutOutboundOrderDetailRepository : RepositoryBase<Dt_MesPPCutOutboundOrderDetail>, IMesPPCutOutboundOrderDetailRepository
- {
- public MesPPCutOutboundOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPCutOutboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPCutOutboundOrderRepository.cs"
deleted file mode 100644
index 84f0b79..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPCutOutboundOrderRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_OutboundRepository
-{
- public class MesPPCutOutboundOrderRepository : RepositoryBase<Dt_MesPPCutOutboundOrder>, IMesPPCutOutboundOrderRepository
- {
- public MesPPCutOutboundOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPOutboundOrderDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPOutboundOrderDetailRepository.cs"
deleted file mode 100644
index 3377a18..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPOutboundOrderDetailRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_OutboundRepository
-{
- public class MesPPOutboundOrderDetailRepository : RepositoryBase<Dt_MesPPOutboundOrderDetail>, IMesPPOutboundOrderDetailRepository
- {
- public MesPPOutboundOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPOutboundOrderRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPOutboundOrderRepository.cs"
deleted file mode 100644
index feace75..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/MesPPOutboundOrderRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_OutboundRepository
-{
- public class MesPPOutboundOrderRepository : RepositoryBase<Dt_MesPPOutboundOrder>, IMesPPOutboundOrderRepository
- {
- public MesPPOutboundOrderRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/OutboundRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/OutboundRepository.cs"
index 81ed156..0030bff 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/OutboundRepository.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundRepository/OutboundRepository.cs"
@@ -15,17 +15,15 @@
public IOutStockLockInfoRepository OutboundStockLockInfoRepository { get; }
- public IMesPPCutOutboundOrderRepository MesPPCutOutboundOrderRepository { get; }
public IProOutOrderRepository ProOutOrderRepository { get; }
public IProOutOrderDetailRepository ProOutOrderDetailRepository { get; }
public IMesRworkOutboundOrderRepository RworkOutboundOrderRepository { get; }
- public OutboundRepository(IOutboundOrderDetailRepository outboundOrderDetailRepository, IOutboundOrderRepository outboundOrderRepository, IOutStockLockInfoRepository outboundStockLockInfoRepository,IMesPPCutOutboundOrderRepository mesPPCutOutboundOrderRepository, IProOutOrderRepository proOutOrderRepository, IProOutOrderDetailRepository proOutOrderDetailRepository, IMesRworkOutboundOrderRepository rworkOutboundOrderRepository)
+ public OutboundRepository(IOutboundOrderDetailRepository outboundOrderDetailRepository, IOutboundOrderRepository outboundOrderRepository, IOutStockLockInfoRepository outboundStockLockInfoRepository, IProOutOrderRepository proOutOrderRepository, IProOutOrderDetailRepository proOutOrderDetailRepository, IMesRworkOutboundOrderRepository rworkOutboundOrderRepository)
{
OutboundOrderDetailRepository = outboundOrderDetailRepository;
OutboundOrderRepository = outboundOrderRepository;
OutboundStockLockInfoRepository = outboundStockLockInfoRepository;
- MesPPCutOutboundOrderRepository = mesPPCutOutboundOrderRepository;
ProOutOrderRepository = proOutOrderRepository;
ProOutOrderDetailRepository = proOutOrderDetailRepository;
RworkOutboundOrderRepository = rworkOutboundOrderRepository;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPCutOutboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPCutOutboundOrderDetailService.cs"
deleted file mode 100644
index 263ac9b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPCutOutboundOrderDetailService.cs"
+++ /dev/null
@@ -1,225 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SqlSugar.Extensions;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-using WIDESEA_OutboundRepository;
-
-namespace WIDESEA_OutboundService
-{
- public class MesPPCutOutboundOrderDetailService : ServiceBase<Dt_MesPPCutOutboundOrderDetail, IMesPPCutOutboundOrderDetailRepository>, IMesPPCutOutboundOrderDetailService
- {
- private readonly IBasicRepository _basicRepository;
- private readonly IStockService _stockService;
- private readonly IOutStockLockInfoService _outStockLockInfoService;
- private readonly IBasicService _basicService;
- private readonly IRecordService _recordService;
-
- public IMesPPCutOutboundOrderDetailRepository Repository => BaseDal;
-
- public MesPPCutOutboundOrderDetailService(IMesPPCutOutboundOrderDetailRepository BaseDal, IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- _stockService = stockService;
- _outStockLockInfoService = outStockLockInfoService;
- _basicService = basicService;
- _recordService = recordService;
- }
-
- public (List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(Dt_MesPPCutOutboundOrderDetail mesPPOutboundOrderDetails, List<PPStockSelectViewDTO> stockSelectViews)
- {
- #region
- //Dt_MesPPCutOutboundOrder OutboundOrder = BaseDal.Db.Queryable<Dt_MesPPCutOutboundOrder>().Where(x => x.Id == mesPPOutboundOrderDetails.OrderId).First();
- //List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
- //List<Dt_MesPPCutOutboundOrderDetail> groupDetails = mesPPOutboundOrderDetails.GroupBy(x => new { x.MaterielCode, x.BatchNo }).Select(x => new Dt_MesPPCutOutboundOrderDetail { OrderQuantity = x.Sum(v => v.OrderQuantity) - x.Sum(v => v.LockQuantity), MaterielCode = x.Key.MaterielCode, BatchNo = x.Key.BatchNo, }).ToList();
-
- //List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- //List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
- //foreach (var item in groupDetails)
- //{
- // float originalNeedQuantity = item.OrderQuantity;
-
- // float needQuantity = originalNeedQuantity;
-
- // List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterielCode, item.BatchNo, OutboundOrder.WarehouseId);
- // if (!stockInfos.Any())
- // {
- // throw new Exception($"鏈壘鍒板彲鍒嗛厤搴撳瓨");
- // }
- // List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, item.MaterielCode, needQuantity, out float residueQuantity);
- // item.LockQuantity += needQuantity - residueQuantity;
- // outStocks.AddRange(autoAssignStocks);
- // float assignQuantity = needQuantity - residueQuantity;
-
- // List<Dt_MesPPCutOutboundOrderDetail> details = mesPPOutboundOrderDetails.Where(x => !string.IsNullOrEmpty(x.BatchNo) ? x.BatchNo == item.BatchNo : true && x.MaterielCode == item.MaterielCode).ToList();
-
- // for (int i = 0; i < details.Count; i++)
- // {
- // float orderQuantity = details[i].OrderQuantity;
- // for (int j = 0; j < autoAssignStocks.Count; j++)
- // {
- // float detailAssignQuantity = outStockLockInfos.Where(x => !string.IsNullOrEmpty(x.BatchNo) ? x.BatchNo == item.BatchNo : true && x.MaterielCode == item.MaterielCode && x.OrderDetailId == details[i].Id).Sum(x => x.AssignQuantity);//鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲�
-
- // float palletAssignQuantity = outStockLockInfos.Where(x => x.BatchNo == item.BatchNo && x.MaterielCode == item.MaterielCode && x.PalletCode == autoAssignStocks[j].PalletCode).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
- // if (string.IsNullOrEmpty(item.BatchNo))
- // {
- // palletAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == item.MaterielCode && x.PalletCode == autoAssignStocks[j].PalletCode).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
- // }
- // float palletOutboundQuantity = autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity);
- // if (palletAssignQuantity < palletOutboundQuantity)//濡傛灉鍑哄簱璇︽儏宸插垎閰嶆暟閲忓皬浜庢墭鐩樺凡鍒嗛厤鏁伴噺锛屽垯鍙互缁х画娣诲姞璇ユ墭鐩樺嚭搴撲俊鎭�
- // {
- // float orderDetailNeedQuantity = details[i].OrderQuantity - detailAssignQuantity;
- // if (orderDetailNeedQuantity > autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity)
- // {
- // details[i].LockQuantity += autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity;
- // Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(OutboundOrder, details[i], autoAssignStocks[j], autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity);
- // outStockLockInfos.Add(outStockLockInfo);
- // }
- // else
- // {
- // Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(OutboundOrder, details[i], autoAssignStocks[j], details[i].OrderQuantity - details[i].LockQuantity);
- // outStockLockInfos.Add(outStockLockInfo);
- // details[i].LockQuantity = details[i].OrderQuantity;
- // break;
- // }
-
- // }
- // }
- // }
-
-
- // locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
-
- //}
- #endregion
- (bool, string) checkResult = CheckSelectStockDeital(mesPPOutboundOrderDetails, stockSelectViews);
- if (!checkResult.Item1) throw new Exception(checkResult.Item2);
- Dt_MesPPCutOutboundOrder OutboundOrder = BaseDal.Db.Queryable<Dt_MesPPCutOutboundOrder>().Where(x => x.Id == mesPPOutboundOrderDetails.OrderId).First();
- float originalNeedQuantity = mesPPOutboundOrderDetails.OrderQuantity - mesPPOutboundOrderDetails.LockQuantity;
-
- float needQuantity = originalNeedQuantity;
-
- List<Dt_StockInfo> outStocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockSelectViews.Select(x => x.PalletCode).ToList());
- float assignQuantity = 0;
- outStocks.ForEach(x =>
- {
- x.Details.ForEach(v =>
- {
- assignQuantity += v.StockQuantity - v.OutboundQuantity;
- });
- });
-
- mesPPOutboundOrderDetails.LockQuantity += assignQuantity;
- outStocks.ForEach(x =>
- {
- x.Details.ForEach(v =>
- {
- v.OutboundQuantity = v.StockQuantity;
- });
- });
- needQuantity -= assignQuantity;
- if (mesPPOutboundOrderDetails.OrderQuantity > mesPPOutboundOrderDetails.LockQuantity)
- {
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(mesPPOutboundOrderDetails.MaterielCode, mesPPOutboundOrderDetails.BatchNo, OutboundOrder.WarehouseId);
- stockInfos = stockInfos.Where(x => !stockSelectViews.Select(v => v.PalletCode).Contains(x.PalletCode)).ToList();
- List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, mesPPOutboundOrderDetails.MaterielCode, needQuantity, out float residueQuantity);
- mesPPOutboundOrderDetails.LockQuantity += needQuantity - residueQuantity;
- outStocks.AddRange(autoAssignStocks);
- mesPPOutboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.AssignOver.ObjToInt();
- if (residueQuantity > 0)
- {
- mesPPOutboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.AssignOverPartial.ObjToInt();
- }
- }
-
- List<Dt_OutStockLockInfo> outStockLockInfos = _outStockLockInfoService.GetOutStockLockInfos(OutboundOrder, mesPPOutboundOrderDetails, outStocks);
-
-
- List<Dt_LocationInfo> locationInfos = _basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList());
- return (outStocks, mesPPOutboundOrderDetails, outStockLockInfos, locationInfos);
- }
- private (bool, string) CheckSelectStockDeital(Dt_MesPPCutOutboundOrderDetail outboundOrderDetail, List<PPStockSelectViewDTO> stockSelectViews)
- {
- if (outboundOrderDetail == null)
- {
- return (false, "鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
- }
- if (outboundOrderDetail.OrderDetailStatus != OrderDetailStatusEnum.New.ObjToInt() && outboundOrderDetail.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt())
- {
- return (false, "璇ユ槑缁嗕笉鍙搷浣�");
- }
- if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
- {
- return (false, "閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺");
- }
- return (true, "鎴愬姛");
- }
-
-
- /// <summary>
- /// 鍑哄簱搴撳瓨鍒嗛厤鍚庯紝鏇存柊鏁版嵁搴撴暟鎹�
- /// </summary>
- /// <param name="stockInfos"></param>
- /// <param name="outboundOrderDetails"></param>
- /// <param name="outStockLockInfos"></param>
- /// <param name="locationInfos"></param>
- /// <param name="locationStatus"></param>
- /// <param name="tasks"></param>
- /// <returns></returns>
- public WebResponseContent LockOutboundStockDataUpdate(List<Dt_StockInfo> stockInfos, List<Dt_MesPPCutOutboundOrderDetail> outboundOrderDetails, List<Dt_OutStockLockInfo> outStockLockInfos, List<Dt_LocationInfo> locationInfos, LocationStatusEnum locationStatus = LocationStatusEnum.Lock, List<Dt_Task>? tasks = null)
- {
- try
- {
- _stockService.StockInfoService.Repository.UpdateData(stockInfos);
- List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
- foreach (var item in stockInfos)
- {
- stockInfoDetails.AddRange(item.Details);
- }
- _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
- BaseDal.UpdateData(outboundOrderDetails);
-
- List<Dt_OutStockLockInfo> addOutStockLockInfos = outStockLockInfos.Where(x => x.Id == 0).ToList();
- if (addOutStockLockInfos != null && addOutStockLockInfos.Any())
- {
- if (tasks != null)
- {
- addOutStockLockInfos.ForEach(x =>
- {
- x.TaskNum = tasks.FirstOrDefault(v => v.PalletCode == x.PalletCode)?.TaskNum;
- });
- }
-
- _outStockLockInfoService.Repository.AddData(addOutStockLockInfos);
- }
- List<Dt_OutStockLockInfo> updateOutStockLockInfos = outStockLockInfos.Where(x => x.Id > 0).ToList();
- if (updateOutStockLockInfos != null && updateOutStockLockInfos.Any())
- {
- _outStockLockInfoService.Repository.UpdateData(updateOutStockLockInfos);
- }
-
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, locationStatus, LocationChangeType.OutboundAssignLocation, "", tasks?.Select(x => x.TaskNum).ToList());
- _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, locationStatus);
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPCutOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPCutOutboundOrderService.cs"
deleted file mode 100644
index b2b4fad..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPCutOutboundOrderService.cs"
+++ /dev/null
@@ -1,37 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-using WIDESEA_OutboundRepository;
-
-namespace WIDESEA_OutboundService
-{
- public class MesPPCutOutboundOrderService : ServiceBase<Dt_MesPPCutOutboundOrder, IMesPPCutOutboundOrderRepository>, IMesPPCutOutboundOrderService
- {
- private readonly IBasicRepository _basicRepository;
- private readonly IStockService _stockService;
- private readonly IOutStockLockInfoService _outStockLockInfoService;
- private readonly IBasicService _basicService;
- private readonly IRecordService _recordService;
-
- public IMesPPCutOutboundOrderRepository Repository => BaseDal;
-
- public MesPPCutOutboundOrderService(IMesPPCutOutboundOrderRepository BaseDal, IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- _stockService = stockService;
- _outStockLockInfoService = outStockLockInfoService;
- _basicService = basicService;
- _recordService = recordService;
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPOutboundOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPOutboundOrderDetailService.cs"
deleted file mode 100644
index eb95355..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPOutboundOrderDetailService.cs"
+++ /dev/null
@@ -1,154 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-using WIDESEA_OutboundRepository;
-
-namespace WIDESEA_OutboundService
-{
- public class MesPPOutboundOrderDetailService : ServiceBase<Dt_MesPPOutboundOrderDetail, IMesPPOutboundOrderDetailRepository>, IMesPPOutboundOrderDetailService
- {
- private readonly IBasicRepository _basicRepository;
- private readonly IStockService _stockService;
- private readonly IOutStockLockInfoService _outStockLockInfoService;
- private readonly IBasicService _basicService;
- private readonly IRecordService _recordService;
- private readonly IMesPPOutboundOrderService _mesPPOutboundOrderService;
- public IMesPPOutboundOrderDetailRepository Repository => BaseDal;
-
- public MesPPOutboundOrderDetailService(IMesPPOutboundOrderDetailRepository BaseDal,IMesPPOutboundOrderService mesPPOutboundOrderService ,IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- _stockService = stockService;
- _outStockLockInfoService = outStockLockInfoService;
- _basicService = basicService;
- _recordService = recordService;
- _mesPPOutboundOrderService=mesPPOutboundOrderService;
- }
-
- public (List<Dt_StockInfo>, List<Dt_MesPPOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>, Dt_MesPPOutboundOrder mesPPOutboundOrder) AssignStockOutbound(List<Dt_MesPPOutboundOrderDetail> mesPPOutboundOrderDetails)
- {
- List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
-
- List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
- Dt_MesPPOutboundOrder OutboundOrder = BaseDal.Db.Queryable<Dt_MesPPOutboundOrder>().Where(x => x.Id == mesPPOutboundOrderDetails.FirstOrDefault().OrderId).First();
- float originalNeedQuantity = OutboundOrder.OrderQuantity;
-
- float needQuantity = originalNeedQuantity;
- //Dt_MesPPOutboundOrder outboundOrder = _outboundRepository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
-
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(OutboundOrder.MaterialCode, "", mesPPOutboundOrderDetails.FirstOrDefault()?.CarrierCode ?? "", OutboundOrder.WarehouseId);
- if (!stockInfos.Any())
- {
- throw new Exception($"鏈壘鍒板彲鍒嗛厤搴撳瓨");
- }
- List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, OutboundOrder.MaterialCode, needQuantity, out float residueQuantity);
- OutboundOrder.LockQuantity += needQuantity - residueQuantity;
- autoAssignStocks.OrderBy(x => x.Details.FirstOrDefault()?.StockQuantity).ToList();
- outStocks.AddRange(autoAssignStocks);
- float assignQuantity = needQuantity - residueQuantity;
-
- float orderQuantity = OutboundOrder.OrderQuantity;
-
- for (int j = 0; j < autoAssignStocks.Count; j++)
- {
- float detailAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == OutboundOrder.MaterialCode).Sum(x => x.AssignQuantity);//鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲�
-
- float palletAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == OutboundOrder.MaterialCode && x.PalletCode == autoAssignStocks[j].PalletCode).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
-
- float palletOutboundQuantity = autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity);
- if (palletAssignQuantity < palletOutboundQuantity)//濡傛灉鍑哄簱璇︽儏宸插垎閰嶆暟閲忓皬浜庢墭鐩樺凡鍒嗛厤鏁伴噺锛屽垯鍙互缁х画娣诲姞璇ユ墭鐩樺嚭搴撲俊鎭�
- {
- float orderDetailNeedQuantity = OutboundOrder.OrderQuantity - detailAssignQuantity;
- if (orderDetailNeedQuantity > autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity)
- {
- OutboundOrder.LockQuantity += autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity;
- //Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(OutboundOrder, autoAssignStocks[j], autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity);
- Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(OutboundOrder, autoAssignStocks[j], assignQuantity);
- outStockLockInfos.Add(outStockLockInfo);
- }
- else
- {
- //Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(OutboundOrder, autoAssignStocks[j], OutboundOrder.OrderQuantity - OutboundOrder.LockQuantity);
- Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(OutboundOrder, autoAssignStocks[j], assignQuantity);
- outStockLockInfos.Add(outStockLockInfo);
- OutboundOrder.LockQuantity = OutboundOrder.OrderQuantity;
- break;
- }
- }
- }
- locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
-
- return (outStocks, mesPPOutboundOrderDetails, outStockLockInfos, locationInfos, OutboundOrder);
- }
-
- /// <summary>
- /// 鍑哄簱搴撳瓨鍒嗛厤鍚庯紝鏇存柊鏁版嵁搴撴暟鎹�
- /// </summary>
- /// <param name="stockInfos"></param>
- /// <param name="outboundOrderDetails"></param>
- /// <param name="outStockLockInfos"></param>
- /// <param name="locationInfos"></param>
- /// <param name="locationStatus"></param>
- /// <param name="tasks"></param>
- /// <returns></returns>
- public WebResponseContent LockOutboundStockDataUpdate(Dt_MesPPOutboundOrder mesPPOutboundOrder, List<Dt_StockInfo> stockInfos, List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails, List<Dt_OutStockLockInfo> outStockLockInfos, List<Dt_LocationInfo> locationInfos, LocationStatusEnum locationStatus = LocationStatusEnum.Lock, List<Dt_Task>? tasks = null)
- {
- try
- {
- _stockService.StockInfoService.Repository.UpdateData(stockInfos);
- List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
- foreach (var item in stockInfos)
- {
- stockInfoDetails.AddRange(item.Details);
- }
- _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
- BaseDal.UpdateData(outboundOrderDetails);
-
- List<Dt_OutStockLockInfo> addOutStockLockInfos = outStockLockInfos.Where(x => x.Id == 0).ToList();
- if (addOutStockLockInfos != null && addOutStockLockInfos.Any())
- {
- if (tasks != null)
- {
- addOutStockLockInfos.ForEach(x =>
- {
- x.TaskNum = tasks.FirstOrDefault(v => v.PalletCode == x.PalletCode)?.TaskNum;
- });
- }
-
- _outStockLockInfoService.Repository.AddData(addOutStockLockInfos);
- }
- List<Dt_OutStockLockInfo> updateOutStockLockInfos = outStockLockInfos.Where(x => x.Id > 0).ToList();
- if (updateOutStockLockInfos != null && updateOutStockLockInfos.Any())
- {
- _outStockLockInfoService.Repository.UpdateData(updateOutStockLockInfos);
- }
- if (mesPPOutboundOrder != null)
- {
- _mesPPOutboundOrderService.UpdateData(mesPPOutboundOrder);
- }
-
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, locationStatus, LocationChangeType.OutboundAssignLocation, "", tasks?.Select(x => x.TaskNum).ToList());
- _basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, locationStatus);
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPOutboundOrderService.cs"
deleted file mode 100644
index 31d97cd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/MesPPOutboundOrderService.cs"
+++ /dev/null
@@ -1,143 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-using WIDESEA_OutboundRepository;
-
-namespace WIDESEA_OutboundService
-{
- public class MesPPOutboundOrderService : ServiceBase<Dt_MesPPOutboundOrder, IMesPPOutboundOrderRepository>, IMesPPOutboundOrderService
- {
- private readonly IBasicRepository _basicRepository;
- private readonly IStockService _stockService;
- private readonly IOutStockLockInfoService _outStockLockInfoService;
- private readonly IBasicService _basicService;
- private readonly IRecordService _recordService;
-
- public IMesPPOutboundOrderRepository Repository => BaseDal;
-
- public MesPPOutboundOrderService(IMesPPOutboundOrderRepository BaseDal, IBasicRepository basicRepository, IStockService stockService, IOutStockLockInfoService outStockLockInfoService, IBasicService basicService, IRecordService recordService) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- _stockService = stockService;
- _outStockLockInfoService = outStockLockInfoService;
- _basicService = basicService;
- _recordService = recordService;
- }
-
- //public (List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(Dt_MesPPOutboundOrder mesPPOutboundOrder)
- //{
- // List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
-
- // List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- // List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
-
- // float originalNeedQuantity = mesPPOutboundOrder.OrderQuantity;
-
- // float needQuantity = originalNeedQuantity;
-
- // List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(mesPPOutboundOrder.MaterialCode, "", mesPPOutboundOrder.Details.FirstOrDefault()?.CarrierCode ?? "",mesPPOutboundOrder.WarehouseId);
- // if (!stockInfos.Any())
- // {
- // throw new Exception($"鏈壘鍒板彲鍒嗛厤搴撳瓨");
- // }
- // List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, mesPPOutboundOrder.MaterialCode, needQuantity, out float residueQuantity);
- // mesPPOutboundOrder.LockQuantity += needQuantity - residueQuantity;
- // outStocks.AddRange(autoAssignStocks);
- // float assignQuantity = needQuantity - residueQuantity;
-
- // float orderQuantity = mesPPOutboundOrder.OrderQuantity;
- // for (int j = 0; j < autoAssignStocks.Count; j++)
- // {
- // float detailAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).Sum(x => x.AssignQuantity);//鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲�
-
- // float palletAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode && x.PalletCode == autoAssignStocks[j].PalletCode).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
-
- // float palletOutboundQuantity = autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity);
- // if (palletAssignQuantity < palletOutboundQuantity)//濡傛灉鍑哄簱璇︽儏宸插垎閰嶆暟閲忓皬浜庢墭鐩樺凡鍒嗛厤鏁伴噺锛屽垯鍙互缁х画娣诲姞璇ユ墭鐩樺嚭搴撲俊鎭�
- // {
- // float orderDetailNeedQuantity = mesPPOutboundOrder.OrderQuantity - detailAssignQuantity;
- // if (orderDetailNeedQuantity > autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity)
- // {
- // mesPPOutboundOrder.LockQuantity += autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity;
- // Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(mesPPOutboundOrder, autoAssignStocks[j], autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity);
- // outStockLockInfos.Add(outStockLockInfo);
- // }
- // else
- // {
- // Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(mesPPOutboundOrder, autoAssignStocks[j], mesPPOutboundOrder.OrderQuantity - mesPPOutboundOrder.LockQuantity);
- // outStockLockInfos.Add(outStockLockInfo);
- // mesPPOutboundOrder.LockQuantity = mesPPOutboundOrder.OrderQuantity;
- // break;
- // }
- // }
- // }
- // locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
-
- // return (outStocks, mesPPOutboundOrder, outStockLockInfos, locationInfos);
- //}
-
-
- //public (List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(Dt_MesPPCutOutboundOrder mesPPOutboundOrder, Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail)
- //{
- // List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
-
- // List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- // List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
- // //Dt_MesPPCutOutboundOrder outboundOrder = BaseDal.Db.Queryable<Dt_MesPPCutOutboundOrder>().Where(x=>x.Id==mesPPOutboundOrder.OrderId).First();
- // float originalNeedQuantity = mesPPCutOutboundOrderDetail.OrderQuantity;
-
- // float needQuantity = originalNeedQuantity;
-
- // List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(mesPPCutOutboundOrderDetail.MaterielCode, "", mesPPOutboundOrder.WarehouseId);
- // if (!stockInfos.Any())
- // {
- // throw new Exception($"鏈壘鍒板彲鍒嗛厤搴撳瓨");
- // }
- // List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, mesPPCutOutboundOrderDetail.MaterielCode, needQuantity, out float residueQuantity);
- // mesPPCutOutboundOrderDetail.LockQuantity += needQuantity - residueQuantity;
- // outStocks.AddRange(autoAssignStocks);
- // float assignQuantity = needQuantity - residueQuantity;
-
- // float orderQuantity = mesPPCutOutboundOrderDetail.OrderQuantity;
- // for (int j = 0; j < autoAssignStocks.Count; j++)
- // {
- // float detailAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.AssignQuantity);//鍑哄簱璁㈠崟鏄庣粏宸插垎閰嶆暟閲�
-
- // float palletAssignQuantity = outStockLockInfos.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode && x.PalletCode == autoAssignStocks[j].PalletCode).Sum(x => x.AssignQuantity);//鍑哄簱璇︽儏宸插垎閰嶆暟閲�
-
- // float palletOutboundQuantity = autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity);
- // if (palletAssignQuantity < palletOutboundQuantity)//濡傛灉鍑哄簱璇︽儏宸插垎閰嶆暟閲忓皬浜庢墭鐩樺凡鍒嗛厤鏁伴噺锛屽垯鍙互缁х画娣诲姞璇ユ墭鐩樺嚭搴撲俊鎭�
- // {
- // float orderDetailNeedQuantity = mesPPCutOutboundOrderDetail.OrderQuantity - detailAssignQuantity;
- // if (orderDetailNeedQuantity > autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity)
- // {
- // mesPPCutOutboundOrderDetail.LockQuantity += autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity;
- // Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(mesPPOutboundOrder, mesPPCutOutboundOrderDetail, autoAssignStocks[j], autoAssignStocks[j].Details.Sum(x => x.OutboundQuantity) - palletAssignQuantity);
- // outStockLockInfos.Add(outStockLockInfo);
- // }
- // else
- // {
- // Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(mesPPOutboundOrder, mesPPCutOutboundOrderDetail, autoAssignStocks[j], mesPPCutOutboundOrderDetail.OrderQuantity - mesPPCutOutboundOrderDetail.LockQuantity);
- // outStockLockInfos.Add(outStockLockInfo);
- // mesPPCutOutboundOrderDetail.LockQuantity = mesPPCutOutboundOrderDetail.OrderQuantity;
- // break;
- // }
- // }
- // }
- // locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
-
- // return (outStocks, mesPPCutOutboundOrderDetail, outStockLockInfos, locationInfos);
- //}
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index cba7d6c..cde09cd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -124,73 +124,6 @@
return outStockLockInfo;
}
- /// <summary>
- /// PP灏忓嵎鍑哄簱
- /// </summary>
- /// <param name="mesPPCutOutboundOrderDetail"></param>
- /// <param name="outStock"></param>
- /// <param name="assignQuantity"></param>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- public List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder, Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail, List<Dt_StockInfo> outStock, int? taskNum = null)
- {
- List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
-
- foreach (var item in outStock)
- {
- Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
- {
- PalletCode = item.PalletCode,
- AssignQuantity = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.OutboundQuantity),
- MaterielCode = mesPPCutOutboundOrderDetail.MaterielCode,
- BatchNo = item.Details.FirstOrDefault().BatchNo,
- LocationCode = item.LocationCode,
- MaterielName = mesPPCutOutboundOrderDetail.MaterielName,
- OrderDetailId = mesPPCutOutboundOrderDetail.Id,
- OrderNo = mesPPCutOutboundOrder.OrderNo,
- OrderType = mesPPCutOutboundOrder.OrderType,
- OriginalQuantity = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
- Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
- StockId = item.Id,
- TaskNum = taskNum,
- OrderQuantity = mesPPCutOutboundOrderDetail.OrderQuantity,
- Unit = mesPPCutOutboundOrderDetail.Unit,
- ProductionDate = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).FirstOrDefault()?.ProductionDate,
- EffectiveDate = item.Details.Where(x => x.MaterielCode == mesPPCutOutboundOrderDetail.MaterielCode).FirstOrDefault()?.EffectiveDate
- };
- outStockLockInfos.Add(outStockLockInfo);
- }
-
- return outStockLockInfos;
- }
-
- public Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null)
- {
-
- Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
- {
- PalletCode = outStock.PalletCode,
- AssignQuantity = assignQuantity,
- MaterielCode = mesPPOutboundOrder.MaterialCode,
- BatchNo = outStock.Details.FirstOrDefault()?.BatchNo ?? "",
- LocationCode = outStock.LocationCode,
- MaterielName = mesPPOutboundOrder.MaterialName,
- OrderDetailId = mesPPOutboundOrder.Id,
- OrderNo = mesPPOutboundOrder.OrderNo,
- OrderType = mesPPOutboundOrder.OrderType,
- OriginalQuantity = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).Sum(x => x.StockQuantity),
- Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
- StockId = outStock.Id,
- TaskNum = taskNum,
- OrderQuantity = mesPPOutboundOrder.OrderQuantity,
- Unit = mesPPOutboundOrder.Unit,
- ProductionDate = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).FirstOrDefault()?.ProductionDate,
- EffectiveDate = outStock.Details.Where(x => x.MaterielCode == mesPPOutboundOrder.MaterialCode).FirstOrDefault()?.EffectiveDate
- };
-
- return outStockLockInfo;
- }
-
public List<Dt_OutStockLockInfo> OutStockLockInfos(string OrderNo)
{
return BaseDal.QueryData(x => x.OrderNo == OrderNo);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutboundService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutboundService.cs"
index e97371f..5b0f623 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutboundService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutboundService.cs"
@@ -16,14 +16,6 @@
public IOutboundOrderService OutboundOrderService { get; }
public IOutStockLockInfoService OutboundStockLockInfoService { get; }
-
- public IMesPPOutboundOrderService MesPPOutboundOrderService { get; }
-
- public IMesPPOutboundOrderDetailService MesPPOutboundOrderDetailService { get; }
-
- public IMesPPCutOutboundOrderService MesPPCutOutboundOrderService { get; }
-
- public IMesPPCutOutboundOrderDetailService MesPPCutOutboundOrderDetailService { get; }
public IProOutOrderService ProOutOrderService { get; }
public IProOutOrderDetailService ProOutOrderDetailService { get; }
@@ -31,16 +23,12 @@
public IErpProTransferOrderService ErpProTransferOrderService { get; }
- public OutboundService(IOutboundOrderDetailService outboundOrderDetailService, IMesRworkOutboundOrderService rworkOutboundOrderService,IMesPPOutboundOrderDetailService mesPPOutboundOrderDetailService, IMesPPCutOutboundOrderDetailService mesPPCutOutboundOrderDetailService, IMesPPCutOutboundOrderService mesPPCutOutboundOrderService, IMesPPOutboundOrderService mesPPOutboundOrderService, IOutboundOrderService outboundOrderService, IOutStockLockInfoService outboundStockLockInfoService, IMesOutboundOrderService mesOutboundOrderService,IProOutOrderService proOutOrderService, IProOutOrderDetailService proOutOrderDetailService,IErpProTransferOrderService erpProTransferOrderService)
+ public OutboundService(IOutboundOrderDetailService outboundOrderDetailService, IMesRworkOutboundOrderService rworkOutboundOrderService, IOutboundOrderService outboundOrderService, IOutStockLockInfoService outboundStockLockInfoService, IMesOutboundOrderService mesOutboundOrderService,IProOutOrderService proOutOrderService, IProOutOrderDetailService proOutOrderDetailService,IErpProTransferOrderService erpProTransferOrderService)
{
OutboundOrderDetailService = outboundOrderDetailService;
OutboundOrderService = outboundOrderService;
OutboundStockLockInfoService = outboundStockLockInfoService;
MesOutboundOrderService = mesOutboundOrderService;
- MesPPOutboundOrderService = mesPPOutboundOrderService;
- MesPPCutOutboundOrderService = mesPPCutOutboundOrderService;
- MesPPCutOutboundOrderDetailService = mesPPCutOutboundOrderDetailService;
- MesPPOutboundOrderDetailService = mesPPOutboundOrderDetailService;
ProOutOrderService = proOutOrderService;
ProOutOrderDetailService = proOutOrderDetailService;
RworkOutboundOrderService = rworkOutboundOrderService;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockRepository/SolderMaskStockRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockRepository/SolderMaskStockRepository.cs"
deleted file mode 100644
index ecd9a6c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockRepository/SolderMaskStockRepository.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockRepository
-{
- public class SolderMaskStockRepository : RepositoryBase<Dt_SolderMaskStock>, ISolderMaskStockRepository
- {
- public SolderMaskStockRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockRepository/SolderMaskStock_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockRepository/SolderMaskStock_HtyRepository.cs"
deleted file mode 100644
index c02cc98..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockRepository/SolderMaskStock_HtyRepository.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockRepository
-{
- public class SolderMaskStock_HtyRepository : RepositoryBase<Dt_SolderMaskStock_Hty>, ISolderMaskStock_HtyRepository
- {
- public SolderMaskStock_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/SolderMaskStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/SolderMaskStockService.cs"
deleted file mode 100644
index 69daa61..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/SolderMaskStockService.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockService
-{
- public partial class SolderMaskStockService : ServiceBase<Dt_SolderMaskStock , ISolderMaskStockRepository>, ISolderMaskStockService
- {
- public ISolderMaskStockRepository Repository => BaseDal;
- public SolderMaskStockService(ISolderMaskStockRepository BaseDal) : base(BaseDal)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/SolderMaskStock_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/SolderMaskStock_HtyService.cs"
deleted file mode 100644
index 378b3c3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/SolderMaskStock_HtyService.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockService
-{
- public partial class SolderMaskStock_HtyService : ServiceBase<Dt_SolderMaskStock_Hty, ISolderMaskStock_HtyRepository>, ISolderMaskStock_HtyService
- {
- public ISolderMaskStock_HtyRepository Repository => BaseDal;
- public SolderMaskStock_HtyService(ISolderMaskStock_HtyRepository BaseDal) : base(BaseDal)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
index e6e6e09..a00e2d9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
@@ -115,90 +115,6 @@
return null;
}
}
- /// <summary>
- /// 鏌ヨ璁㈠崟PP绔嬪簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<PPStockSelectViewDTO> PPGetStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (mesPPCutOutboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- List<string> locationCodes = _basicRepository.LocationInfoRepository.PPGetCanOutLocationCodes(mesPPCutOutboundOrder.WarehouseId);
-
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new PPStockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = a.PalletCode,
- Unit = b.Unit,
- CutedWidth = b.CutedWidth,
- UseableQuantity = b.StockQuantity - b.OutboundQuantity
- }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new PPStockSelectViewDTO
- {
- LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- Unit = x.FirstOrDefault()?.Unit ?? "",
- CutedWidth = x.Sum(x => x.CutedWidth),
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
-
- return null;
- }
- }
-
- /// <summary>
- /// 鏌ヨ璁㈠崟PP骞冲簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- public List<PPStockSelectViewDTO> PPGetPKStockSelectViews(int orderId, string materielCode)
- {
- try
- {
- Dt_MesPPCutOutboundOrder outboundOrder = _outboundRepository.MesPPCutOutboundOrderRepository.QueryFirst(x => x.Id == orderId);
- if (outboundOrder == null)
- {
- throw new Exception($"鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, PPStockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new PPStockSelectViewDTO
- {
- LocationCode = a.LocationCode,
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- PalletCode = a.PalletCode,
- Unit = b.Unit,
- CutedWidth = b.CutedWidth,
- UseableQuantity = b.StockQuantity - b.OutboundQuantity
- }, a => a.LocationCode.Contains("AGV_PP"), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new PPStockSelectViewDTO
- {
- LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- Unit = x.FirstOrDefault()?.Unit ?? "",
- CutedWidth = x.Sum(x => x.CutedWidth),
- PalletCode = x.Key,
- UseableQuantity = x.Sum(x => x.UseableQuantity)
- }).ToList();
- }
- catch (Exception ex)
- {
- return null;
- }
- }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
index 0df30d5..42b7f49 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -508,922 +508,5 @@
return MesResponseContent.Instance.Error(ex.Message);
}
}
-
- /// <summary>
- /// PP澶у嵎鍑哄簱-杩涜鍒嗗嵎
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public MesResponseContent PPSubsectionOut(PPSubsectionOutModel model)
- {
- MesResponseContent modelCount = new MesResponseContent();
- try
- {
-
- Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
- if (warehouse == null)
- {
- return MesResponseContent.Instance.Error("浠撳簱淇℃伅鏈厤缃�");
- }
- Dt_MesPPOutboundOrder mesPPOutboundOrder = BaseDal.Db.Queryable<Dt_MesPPOutboundOrder>().Where(x => x.TaskNo == model.TaskNo).Includes(x => x.Details).First();
- if (mesPPOutboundOrder != null)
- {
- return MesResponseContent.Instance.Error("宸插瓨鍦ㄦ浠诲姟鍗曞彿");
- }
- List<Dt_MesPPOutboundOrderDetail> mesPPOutboundOrderDetail = new List<Dt_MesPPOutboundOrderDetail>();
- foreach (var item in model.Carriers)
- {
- //mesPPOutboundOrderDetail.Add(_mapper.Map<Dt_MesPPOutboundOrderDetail>(item));
- Dt_MesPPOutboundOrderDetail dt_MesPPOutboundOrderDetail = new Dt_MesPPOutboundOrderDetail
- {
- CarrierCode = item.CarrierCode,
- Warehouse = item.Warehouse,
- OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt()
- };
- mesPPOutboundOrderDetail.Add(dt_MesPPOutboundOrderDetail);
- }
- Dt_MesPPOutboundOrder mesOutboundOrder = new Dt_MesPPOutboundOrder()
- {
- CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
- MaterialCode = model.MaterialCode,
- MaterialName = model.MaterialName,
- OrderQuantity = model.RequiredQuantity,
- TaskNo = model.TaskNo,
- Unit = model.Unit,//PP闇�瑕佽浆鎹㈡垚绫�(闇�姹傚钩鏂�(PNL鏁�*闈㈢Н)/瀹藉害)
- Width = model.Width,
- TargetAddressCode = model.TargetAddressCode,
- OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
- OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
- WarehouseId = warehouse.WarehouseId,
- Details = mesPPOutboundOrderDetail
- };
- #region
- //Db.InsertNav(mesOutboundOrder).Include(x=>x.Details).ExecuteCommand();
- // List<Dt_Task> tasks = new List<Dt_Task>();
-
- // List<Dt_StockInfo>? stockInfos = null;
- // List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- // List<Dt_LocationInfo>? locationInfos = null;
- // {
- //(List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignStockOutbound(mesOutboundOrder);
- // if (result.Item1 != null && result.Item1.Count > 0)
- // {
- // tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
- // result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- // result.Item3.ForEach(x =>
- // {
- // x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- // });
-
- // stockInfos = result.Item1;
- // mesOutboundOrder = result.Item2;
- // outStockLockInfos = result.Item3;
- // locationInfos = result.Item4;
- // mesPPOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
-
- // }
- // else
- // {
- // throw new Exception("鏃犲簱瀛�");
- // }
- // }
- // tasks.ForEach(x =>
- // {
- // x.TargetAddress = model.TargetAddressCode;
- // });
- // _unitOfWorkManage.BeginTran();
-
- // int id = BaseDal.AddData(tasks);
- // outStockLockInfos.ForEach(x =>
- // {
- // x.OrderNo = mesOutboundOrder.TaskNo;
- // x.OrderDetailId = id;
- // });
- // //_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
- // Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
- // if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- // {
- // WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);
-
- // if (!content.Status)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return MesResponseContent.Instance.Error(content.Message);
- // }
- // }
- // _unitOfWorkManage.CommitTran();
- // PushTasksToWCS(tasks);
-
- //}
- #endregion
- _unitOfWorkManage.BeginTran();
- Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
- return MesResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return MesResponseContent.Instance.Error(ex.Message);
- }
-
- }
-
- /// <summary>
- /// PP灏忓嵎鍑哄簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public MesResponseContent PPCutOut(PPCutOutModle model)
- {
- try
- {
-
- Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
- if (warehouse == null)
- {
- return MesResponseContent.Instance.Error("浠撳簱鍩虹淇℃伅鏈厤缃�");
- }
- Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder = BaseDal.Db.Queryable<Dt_MesPPCutOutboundOrder>().Where(x => x.TaskNo == model.TaskNo).Includes(x => x.Details).First();
- if (mesPPCutOutboundOrder != null)
- {
- return MesResponseContent.Instance.Error("宸插瓨鍦ㄦ浠诲姟鍗曞彿");
- }
- List<Dt_MesPPCutOutboundOrderDetail> mesPPCutOutboundOrderDetail = new List<Dt_MesPPCutOutboundOrderDetail>();
- foreach (var item in model.MaterialDetails)
- {
- mesPPCutOutboundOrderDetail.Add(_mapper.Map<Dt_MesPPCutOutboundOrderDetail>(item));
- }
- Dt_MesPPCutOutboundOrder mesPPOutboundOrder = new Dt_MesPPCutOutboundOrder()
- {
- CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
- TaskNo = model.TaskNo,
- OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
- OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
- WarehouseId = warehouse.WarehouseId,
- Details = mesPPCutOutboundOrderDetail,
- };
- _unitOfWorkManage.BeginTran();
- Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
- #region
- //List<Dt_Task> tasks = new List<Dt_Task>();
-
- //List<Dt_StockInfo>? stockInfos = null;
- //List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- //List<Dt_LocationInfo>? locationInfos = null;
- //{
- //(List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignStockOutbound(mesPPOutboundOrder, mesPPCutOutboundOrderDetail);
- // if (result.Item1 != null && result.Item1.Count > 0)
- // {
- // tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
- // result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- // result.Item3.ForEach(x =>
- // {
- // x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- // });
-
- // stockInfos = result.Item1;
- // mesPPCutOutboundOrderDetail = result.Item2;
- // outStockLockInfos = result.Item3;
- // locationInfos = result.Item4;
-
- // }
- // else
- // {
- // throw new Exception("鏃犲簱瀛�");
- // }
- //}
- //tasks.ForEach(x =>
- //{
- // x.TargetAddress = mesPPCutOutboundOrderDetail.TargetAddressCode;
- //});
- //_unitOfWorkManage.BeginTran();
-
- //int id = BaseDal.AddData(tasks);
- //outStockLockInfos.ForEach(x =>
- //{
- // x.OrderNo = mesPPOutboundOrder.TaskNo;
- // x.OrderDetailId = id;
- //});
- ////_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
- //Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
- //if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- //{
- // WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);
-
- // if (!content.Status)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return MesResponseContent.Instance.Error(content.Message);
- // }
- //}
- //_unitOfWorkManage.CommitTran();
- //PushTasksToWCS(tasks, "AGV_PP");
- #endregion
- return MesResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return MesResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// PP鍏ュ簱(澶у嵎銆佸皬鍗枫�佸紶鏂�)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public MesResponseContent PPBack(PPBackModel model)
- {
- try
- {
- //涓�娆″彧鍙戜竴鍗风墿鏂欏叆搴撴槑缁�
- foreach (var item in model.MaterialLotInfo)
- {
- //鑾峰彇鐗╂枡淇℃伅
- Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == item.MaterialCode);
- if (materielInfo == null)
- {
- return MesResponseContent.Instance.Error($"鐗╂枡{item.MaterialCode}涓嶅瓨鍦�!");
- }
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
- if (warehouse == null)
- {
- return MesResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
- }
- Dt_MesPPBackInboundOrderDetail mesPPBackInboundOrderDetail = new Dt_MesPPBackInboundOrderDetail()
- {
- MaterialLot = item.MaterialLot,
- MaterielCode = item.MaterialCode,
- OrderQuantity = item.Quantity,
- CutedWidth = item.CutedWidth,
- MaterialLotOld = item.MaterialLotOld,
- Unit = item.Unit,
- ProductionDate = item.ProductionDate,
- EffectiveDate = item.ExpirationDate,
- OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
- };
- Dt_MesPPBackInboundOrder mesPPBackInboundOrder = new Dt_MesPPBackInboundOrder()
- {
- WarehouseId = warehouse.WarehouseId,
- SourceAddressCode = model.SourceAddressCode,
- CarrierCode = model.CarrierCode,
- OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
- Details = new List<Dt_MesPPBackInboundOrderDetail> { mesPPBackInboundOrderDetail }
- };
-
- Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
- {
- BatchNo = mesPPBackInboundOrderDetail.MaterialLot,
- MaterielCode = mesPPBackInboundOrderDetail.MaterielCode,
- MaterielName = materielInfo.MaterielName,
- OrderNo = "",
- SerialNumber = "",
- StockQuantity = mesPPBackInboundOrderDetail.OrderQuantity,
- OutboundQuantity = 0,
- Unit = materielInfo.MaterielUnit,
- Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
- ProductionDate = mesPPBackInboundOrderDetail.ProductionDate,
- EffectiveDate = mesPPBackInboundOrderDetail.EffectiveDate,
- InboundOrderRowNo = mesPPBackInboundOrderDetail.RowNo,
- };
-
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- PalletCode = model.CarrierCode,
- StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
- WarehouseId = mesPPBackInboundOrder.WarehouseId,
- Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
- };
- _unitOfWorkManage.BeginTran();
- Db.InsertNav(mesPPBackInboundOrder).Include(x => x.Details).ExecuteCommand();
- Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
- WebResponseContent content = DeviceRequestInboundTask(mesPPBackInboundOrder, stockInfo);
- if (!content.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return MesResponseContent.Instance.Error(content.Message);
- }
- _unitOfWorkManage.CommitTran();
- }
- return MesResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return MesResponseContent.Instance.Error(ex.Message);
- }
-
- }
-
- public WebResponseContent DeviceRequestInboundTask(Dt_MesPPBackInboundOrder mesPPBackInboundOrder, Dt_StockInfo stockInfo)
- {
- try
- {
- Dt_Task task = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- if (task != null)
- {
- PushTasksToWCS(new List<Dt_Task> { task });
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
- }
- if (Repository.QueryFirst(x => x.SourceAddress == stockInfo.PalletCode && x.TaskStatus == TaskStatusEnum.New.ObjToInt()) != null)
- {
- return WebResponseContent.Instance.Error($"璇ョ珯鐐瑰凡鏈夋湭鎵ц鐨勪换鍔�");
- }
- //Dt_StockInfo stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
- //if (stockInfos == null)
- //{
- // return WebResponseContent.Instance.Error($"鏈壘鍒扮粍鐩樹俊鎭�");
- //}
- //if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎷ｉ�夊畬鎴�.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.閫�搴�.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.MES閫�搴�.ObjToInt())
- //{
- // return WebResponseContent.Instance.Error($"璇ユ墭鐩樼姸鎬佷笉姝ｇ‘,涓嶅彲鐢宠鍏ュ簱");
- //}
- //if (!string.IsNullOrEmpty(stockInfo.LocationCode))
- //{
- // return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
- //}
- //鍙叆骞冲簱,闇�鍒ゆ柇骞冲簱瀹氫箟璐т綅绫诲瀷銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
- Dt_LocationInfo? locationInfos = _basicRepository.LocationInfoRepository.QueryFirst(x => x.WarehouseId == stockInfo.WarehouseId && x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt());
- Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(locationInfos.RoadwayNo, stockInfo.PalletType, stockInfo.WarehouseId);
- if (locationInfo == null)
- {
- return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
- }
-
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = mesPPBackInboundOrder.SourceAddressCode,
- Grade = 0,
- NextAddress = locationInfo.LocationCode,
- PalletCode = stockInfo.PalletCode,
- Roadway = locationInfo.RoadwayNo,//宸烽亾鍙峰寘鍚獳GV
- SourceAddress = mesPPBackInboundOrder.SourceAddressCode,
- TargetAddress = locationInfo.LocationCode,
- TaskType = TaskTypeEnum.Inbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = stockInfo.WarehouseId,
- PalletType = stockInfo.PalletType,
- MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode,
- Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.StockQuantity,
- };
- LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
- _unitOfWorkManage.BeginTran();
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.Lock, LocationChangeType.InboundAssignLocation);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, newTask.PalletType, LocationStatusEnum.Lock, newTask.WarehouseId);
- BaseDal.AddData(newTask);
- _stockRepository.StockInfoRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
-
- PushTasksToWCS(new List<Dt_Task> { newTask });
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// PP搴撳瓨鏌ヨ
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public MesResponseContent QueryPpByWidth(QueryPpByWidthModel model)
- {
- MesResponseContent content = new MesResponseContent();
- try
- {
- //闇�鍒ゆ柇鏌ヨ绔嬪簱,骞冲簱
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
- List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
- x.WarehouseId == warehouse.WarehouseId &&
- x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚).Includes(x => x.Details).ToList();
- Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.MaterielCode == model.MaterialCode && x.CutedWidth == model.CutedWidth));
- if (stockInfo == null)
- {
- return content.Error($"PP浠撶珛搴�/骞冲簱锛氱墿鏂欑紪鍙�:{model.MaterialCode},瑁佸垏瀹�:{model.CutedWidth},鏈壘鍒版鐗╂枡搴撳瓨淇℃伅");
- }
- var stock = stockInfo.Details.FirstOrDefault();
- if (stock != null)
- {
- content.Content = new
- {
- MaterialCode = stock.MaterielCode,
- Quantity = stock.StockQuantity,
- Unit = stock.Unit,
- Warehouse = warehouse.WarehouseCode,
- WarehouseName = warehouse.WarehouseName,
- CutedWidth = stock.CutedWidth,
- CarrierCode = stockInfo.PalletCode,
- MaterialLot = stock.BatchNo,
- };
- }
- return content.OK();
- }
- catch (Exception ex)
- {
- return MesResponseContent.Instance.Error(ex.Message);
- }
- }
-
-
-
- /// <summary>
- /// 鐢熸垚PP澶у嵎鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys">鍑哄簱鍗曟槑缁嗕富閿�</param>
- /// <returns></returns>
- public WebResponseContent MESPPGenerateOutboundTasks(int[] keys)
- {
- try
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
- List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
- List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails = new List<Dt_MesPPOutboundOrderDetail>();
- List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
-
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, Dt_MesPPOutboundOrder mesPPOutboundOrder) result = MESPPOutboundTaskDataHandle(keys);
- if (result.Item2 != null && result.Item2.Count > 0)
- {
- stockInfos.AddRange(result.Item2);
- }
- if (result.Item3 != null && result.Item3.Count > 0)
- {
- outboundOrderDetails.AddRange(result.Item3);
- }
- if (result.Item4 != null && result.Item4.Count > 0)
- {
- outStockLockInfos.AddRange(result.Item4);
- }
- if (result.Item5 != null && result.Item5.Count > 0)
- {
- locationInfos.AddRange(result.Item5);
- }
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- tasks.AddRange(result.Item1);
- }
- if (result.mesPPOutboundOrder != null)
- {
-
- }
-
- WebResponseContent content = MESPPGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, result.mesPPOutboundOrder);
- return content;
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// PP澶у嵎鍑哄簱浠诲姟鏁版嵁澶勭悊
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, Dt_MesPPOutboundOrder mesPPOutboundOrder) MESPPOutboundTaskDataHandle(int[] keys)
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_MesPPOutboundOrderDetail> outboundOrderDetails = BaseDal.Db.Queryable<Dt_MesPPOutboundOrderDetail>().Where(x => keys.Contains(x.Id)).ToList();
- if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
- {
- throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
- }
- if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
- {
- throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
- }
- List<Dt_StockInfo>? stockInfos = null;
- List<Dt_MesPPOutboundOrderDetail>? orderDetails = null;
- List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- List<Dt_LocationInfo>? locationInfos = null;
- Dt_MesPPOutboundOrder? mesPPOutboundOrders = null;
- if (outboundOrderDetails.FirstOrDefault().OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- {
- (List<Dt_StockInfo>, List<Dt_MesPPOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>, Dt_MesPPOutboundOrder mesPPOutboundOrder) result = _outboundService.MesPPOutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- Dt_MesPPOutboundOrder outboundOrder = _outboundService.MesPPOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
- TaskTypeEnum typeEnum = outboundOrder.OrderType switch
- {
- (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
- (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
- (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
- _ => new TaskTypeEnum()
- };
- tasks = GetTasks(result.Item1, typeEnum);
- result.Item2.ForEach(x =>
- {
- x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- });
- result.Item3.ForEach(x =>
- {
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- });
-
- stockInfos = result.Item1;
- orderDetails = result.Item2;
- outStockLockInfos = result.Item3;
- locationInfos = result.Item4;
- mesPPOutboundOrders = result.mesPPOutboundOrder;
- }
- else
- {
- throw new Exception("鏃犲簱瀛�");
- }
- }
- //else
- //{
- // List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetails.oi, OutLockStockStatusEnum.宸插垎閰�);
- // if (stockLockInfos != null && stockLockInfos.Count > 0)
- // {
- // List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
- // tasks = GetTasks(stocks);
- // }
- //}
-
- return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos, mesPPOutboundOrders);
- }
-
- /// <summary>
- /// PP骞冲簱鐩存帴鍑哄簱
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- public WebResponseContent PPGeneratePKOutboundTask(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews)
- {
- try
- {
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = PPOutboundTaskDataHandle(orderDetailId, stockSelectViews);
-
- WebResponseContent content = PPGenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
-
- return content;
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- /// <summary>
- /// PP绔嬪簱灏忓嵎鐩存帴鍑哄簱
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- public WebResponseContent PPCutOutGenerateOutboundTasks(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews)
- {
- try
- {
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = PPOutboundTaskDataHandle(orderDetailId, stockSelectViews);
-
- WebResponseContent content = PPGenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
-
- return content;
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍑哄簱浠诲姟鏁版嵁澶勭悊
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) PPOutboundTaskDataHandle(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews)
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- Dt_MesPPCutOutboundOrderDetail outboundOrderDetail = _outboundService.MesPPCutOutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);
-
- if (outboundOrderDetail == null)
- {
- throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
- }
-
- if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
- {
- throw new Exception("閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺");
- }
- List<Dt_StockInfo>? stockInfos = null;
- Dt_MesPPCutOutboundOrderDetail? orderDetail = null;
- List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- List<Dt_LocationInfo>? locationInfos = null;
- if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- {
- (List<Dt_StockInfo>, Dt_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPCutOutboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- Dt_MesPPCutOutboundOrder outboundOrder = _outboundService.MesPPCutOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
- TaskTypeEnum typeEnum = outboundOrder.OrderType switch
- {
- (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
- (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
- (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
- _ => new TaskTypeEnum()
- };
- tasks = GetTasks(result.Item1, TaskTypeEnum.Outbound);
- result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- result.Item3.ForEach(x =>
- {
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- });
-
- stockInfos = result.Item1;
- orderDetail = result.Item2;
- outStockLockInfos = result.Item3;
- locationInfos = result.Item4;
- }
- else
- {
- throw new Exception("鏃犲簱瀛�");
- }
- }
- else
- {
- List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId, OutLockStockStatusEnum.宸插垎閰�);
- if (stockLockInfos != null && stockLockInfos.Count > 0)
- {
- List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
- tasks = GetTasks(stocks, TaskTypeEnum.Outbound);
- }
- }
-
- return (tasks, stockInfos, orderDetail == null ? null : new List<Dt_MesPPCutOutboundOrderDetail> { orderDetail }, outStockLockInfos, locationInfos);
- }
-
- public WebResponseContent PPGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_MesPPCutOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
- {
- try
- {
- _unitOfWorkManage.BeginTran();
-
- BaseDal.AddData(tasks);
- if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- {
- stockInfos.ForEach(x =>
- {
- x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- });
- WebResponseContent content = _outboundService.MesPPCutOutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
- if (!content.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content;
- }
- }
- else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
- {
- outboundOrderDetails.ForEach(x =>
- {
- x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- });
-
- _outboundService.MesPPCutOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- }
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
-
- }
- #region
- /// <summary>
- /// 鐢熸垚PP灏忓嵎鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys">鍑哄簱鍗曟槑缁嗕富閿�</param>
- /// <returns></returns>
- //public WebResponseContent PPCutOutGenerateOutboundTasks(int[] keys)
- //{
- // try
- // {
- // List<Dt_Task> tasks = new List<Dt_Task>();
- // List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
- // List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
- // List<Dt_MesPPCutOutboundOrderDetail> outboundOrderDetails = new List<Dt_MesPPCutOutboundOrderDetail>();
- // List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- // List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
-
- // (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = PPCutOutboundTaskDataHandle(keys);
- // if (result.Item2 != null && result.Item2.Count > 0)
- // {
- // stockInfos.AddRange(result.Item2);
- // }
- // if (result.Item3 != null && result.Item3.Count > 0)
- // {
- // outboundOrderDetails.AddRange(result.Item3);
- // }
- // if (result.Item4 != null && result.Item4.Count > 0)
- // {
- // outStockLockInfos.AddRange(result.Item4);
- // }
- // if (result.Item5 != null && result.Item5.Count > 0)
- // {
- // locationInfos.AddRange(result.Item5);
- // }
- // if (result.Item1 != null && result.Item1.Count > 0)
- // {
- // tasks.AddRange(result.Item1);
- // }
-
- // WebResponseContent content = PPCutOutGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
- // return content;
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
-
- ///// <summary>
- ///// PP灏忓嵎鍑哄簱浠诲姟鏁版嵁澶勭悊
- ///// </summary>
- ///// <param name="orderDetailId"></param>
- ///// <param name="stockSelectViews"></param>
- ///// <returns></returns>
- ///// <exception cref="Exception"></exception>
- //public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_MesPPCutOutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) PPCutOutboundTaskDataHandle(int[] keys)
- //{
- // List<Dt_Task> tasks = new List<Dt_Task>();
- // List<Dt_MesPPCutOutboundOrderDetail> outboundOrderDetails = BaseDal.Db.Queryable<Dt_MesPPCutOutboundOrderDetail>().Where(x => keys.Contains(x.Id)).ToList();
- // if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
- // {
- // throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
- // }
- // if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
- // {
- // throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
- // }
- // List<Dt_StockInfo>? stockInfos = null;
- // List<Dt_MesPPCutOutboundOrderDetail>? orderDetails = null;
- // List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- // List<Dt_LocationInfo>? locationInfos = null;
- // if (outboundOrderDetails.FirstOrDefault().OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- // {
- // (List<Dt_StockInfo>, List<Dt_MesPPCutOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPCutOutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
- // if (result.Item1 != null && result.Item1.Count > 0)
- // {
- // Dt_MesPPCutOutboundOrder outboundOrder = _outboundService.MesPPCutOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
- // //TaskTypeEnum typeEnum = outboundOrder.OrderType switch
- // //{
- // // (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
- // // (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
- // // (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
- // // _ => new TaskTypeEnum()
- // //};
- // tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
- // result.Item2.ForEach(x =>
- // {
- // x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- // });
- // result.Item3.ForEach(x =>
- // {
- // x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- // });
-
- // stockInfos = result.Item1;
- // orderDetails = result.Item2;
- // outStockLockInfos = result.Item3;
- // locationInfos = result.Item4;
- // }
- // else
- // {
- // throw new Exception("鏃犲簱瀛�");
- // }
- // }
- // //else
- // //{
- // // List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetails.OrderId, OutLockStockStatusEnum.宸插垎閰�);
- // // if (stockLockInfos != null && stockLockInfos.Count > 0)
- // // {
- // // List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
- // // tasks = GetTasks(stocks);
- // // }
- // //}
-
- // return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
- //}
-
- ///// <summary>
- ///// 鐢熸垚PP灏忓嵎鍑哄簱浠诲姟鍚庢暟鎹洿鏂板埌鏁版嵁搴�
- ///// </summary>
- ///// <param name="tasks"></param>
- ///// <param name="stockInfos"></param>
- ///// <param name="outboundOrderDetails"></param>
- ///// <param name="outStockLockInfos"></param>
- ///// <param name="locationInfos"></param>
- ///// <returns></returns>
- //public WebResponseContent PPCutOutGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_MesPPCutOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
- //{
- // try
- // {
- // _unitOfWorkManage.BeginTran();
-
- // BaseDal.AddData(tasks);
- // if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- // {
- // stockInfos.ForEach(x =>
- // {
- // x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- // });
- // WebResponseContent content = _outboundService.MesPPCutOutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
-
- // if (!content.Status)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return content;
- // }
- // }
- // else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
- // {
- // outboundOrderDetails.ForEach(x =>
- // {
- // x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- // });
-
- // _outboundService.MesPPCutOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- // }
- // _unitOfWorkManage.CommitTran();
- // PushTasksToWCS(tasks,"AGV_PP");
- // return WebResponseContent.Instance.OK();
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- #endregion
- /// <summary>
- /// 鐢熸垚PP澶у嵎鍑哄簱浠诲姟鍚庢暟鎹洿鏂板埌鏁版嵁搴�
- /// </summary>
- /// <param name="tasks"></param>
- /// <param name="stockInfos"></param>
- /// <param name="outboundOrderDetails"></param>
- /// <param name="outStockLockInfos"></param>
- /// <param name="locationInfos"></param>
- /// <returns></returns>
- public WebResponseContent MESPPGenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_MesPPOutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null, Dt_MesPPOutboundOrder? mesPPOutboundOrder = null)
- {
- try
- {
- _unitOfWorkManage.BeginTran();
-
- BaseDal.AddData(tasks);
- if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- {
- stockInfos.ForEach(x =>
- {
- x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- });
- WebResponseContent content = _outboundService.MesPPOutboundOrderDetailService.LockOutboundStockDataUpdate(mesPPOutboundOrder, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
-
- if (!content.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content;
- }
- }
- else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
- {
- outboundOrderDetails.ForEach(x =>
- {
- x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- });
-
- _outboundService.MesPPOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- }
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
index 908cc94..2d67961 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
@@ -621,7 +621,6 @@
List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.TaskNum == taskNum);
List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
List<Dt_MesOutboundOrder> mesOutboundOrders = new List<Dt_MesOutboundOrder>();
- List<Dt_MesPPOutboundOrder> mesPPOutboundOrders = new List<Dt_MesPPOutboundOrder>();
if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && warehouse.WarehouseCode != WarehouseEnum.HA64.ToString() && (task.TaskType != TaskTypeEnum.OutEmpty.ObjToInt()))
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撹鎯呬俊鎭�");
@@ -641,20 +640,6 @@
mesOutboundOrder.OrderStatus = OrderDetailStatusEnum.Over.ObjToInt();
}
mesOutboundOrders.Add(mesOutboundOrder);
- }
- }
- //PP鍑哄簱浠诲姟瀹屾垚鍒ゆ柇銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
- else if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() && warehouse.WarehouseCode == WarehouseEnum.HA58.ToString())
- {
- Dt_MesPPOutboundOrder mesPPOutboundOrder = _outboundService.MesPPOutboundOrderService.Repository.QueryFirst(x => x.OrderNo == item.OrderNo);
- if (mesPPOutboundOrder != null)
- {
- mesPPOutboundOrder.OverOutQuantity = item.AssignQuantity;
- if (mesPPOutboundOrder.OverOutQuantity == mesPPOutboundOrder.OrderQuantity)
- {
- mesPPOutboundOrder.OrderStatus = OrderDetailStatusEnum.Over.ObjToInt();
- }
- mesPPOutboundOrders.Add(mesPPOutboundOrder);
}
}
else
@@ -719,15 +704,6 @@
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, (LocationStatusEnum)beforeStatus, LocationStatusEnum.Free, LocationChangeType.OutboundCompleted, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
_unitOfWorkManage.CommitTran();
- //PP鍑哄簱浠诲姟瀹屾垚鍒ゆ柇銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
- if (warehouse.WarehouseCode == WarehouseEnum.HA58.ToString() && task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
- {
- _outboundService.MesPPOutboundOrderService.Repository.UpdateData(mesPPOutboundOrders);
- MesMaterialLotaAceptModel model = GetMesMaterialLotaAceptModel(stockInfo, stockInfo.Details.FirstOrDefault(), mesPPOutboundOrders.FirstOrDefault().TaskNo, warehouse.WarehouseCode, stockInfo.Details.Where(x => x.MaterielCode == mesPPOutboundOrders.FirstOrDefault().MaterialCode).Sum(x => x.StockQuantity));
- UploadMesMaterialLotaAcept(model);
- _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
- _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
- }
if (warehouse.WarehouseCode != WarehouseEnum.HA64.ToString() && task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
{
_outboundService.OutboundOrderService.TestOutUpload(outboundOrderDetails.FirstOrDefault().OrderId, outStockLockInfos);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MesPPBackInboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MesPPBackInboundOrderController.cs"
deleted file mode 100644
index 6faf41f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MesPPBackInboundOrderController.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// PP浠撳皬鍗稭ES鍑哄簱鍗�
- /// </summary>
- [Route("api/mesPPBackInboundOrder")]
- [ApiController]
- public class MesPPBackInboundOrderController : ApiBaseController<IMesPPBackInboundOrderService, Dt_MesPPBackInboundOrder>
- {
- public MesPPBackInboundOrderController(IMesPPBackInboundOrderService service) : base(service)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MesPPBackInboundOrderDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MesPPBackInboundOrderDetailController.cs"
deleted file mode 100644
index 237a6e3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MesPPBackInboundOrderDetailController.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// PP浠撳皬鍗稭ES鍑哄簱鍗曟槑缁�
- /// </summary>
- [Route("api/mesPPBackInboundOrderDetail")]
- [ApiController]
- public class MesPPBackInboundOrderDetailController : ApiBaseController<IMesPPBackInboundOrderDetailService, Dt_MesPPBackInboundOrderDetail>
- {
- public MesPPBackInboundOrderDetailController(IMesPPBackInboundOrderDetailService service) : base(service)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
index 0c04ed1..7e7102d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
@@ -99,49 +99,6 @@
return _taskService.SubstrateBack(model.Content);
}
/// <summary>
- /// PP澶у嵎鍑哄簱-杩涜鍒嗗嵎
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("PPSubsectionOut"), AllowAnonymous]
- public MesResponseContent PPSubsectionOut([FromBody] Root<PPSubsectionOutModel> model)
- {
- return _taskService.PPSubsectionOut(model.Content);
- }
- /// <summary>
- /// PP灏忓嵎鍑哄簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("PPCutOut"), AllowAnonymous]
- public MesResponseContent PPCutOut([FromBody] Root<PPCutOutModle> model)
- {
- return _taskService.PPCutOut(model.Content);
- }
-
- /// <summary>
- /// PP鍏ュ簱(澶у嵎銆佸皬鍗枫�佸紶鏂�)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("PPBack"), AllowAnonymous]
- public MesResponseContent PPBack([FromBody] Root<PPBackModel> model)
- {
- return _taskService.PPBack(model.Content);
- }
-
- /// <summary>
- /// PP搴撳瓨鏌ヨ
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost, Route("QueryPpByWidth"), AllowAnonymous]
- public MesResponseContent QueryPpByWidth([FromBody] Root<QueryPpByWidthModel> model)
- {
- return _taskService.QueryPpByWidth(model.Content);
- }
-
- /// <summary>
/// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
/// </summary>
/// <param name="model"></param>
@@ -200,51 +157,5 @@
{
return _outboundService.RworkOutboundOrderService.ProductOutBoundSync(model);
}
- /// <summary>
- /// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔�
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("MESPPGenerateOutboundTasks"), AllowAnonymous]
- public WebResponseContent MESPPGenerateOutboundTasks([FromBody] int[] keys)
- {
- return _taskService.MESPPGenerateOutboundTasks(keys);
- }
-
- /// <summary>
- /// 鐢熸垚MESPP浠撳皬鍗峰嚭搴撲换鍔�
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- //[HttpPost, HttpGet, Route("PPCutOutGenerateOutboundTasks"), AllowAnonymous]
- //public WebResponseContent PPCutOutGenerateOutboundTasks([FromBody] int[] keys)
- //{
- // return _taskService.PPCutOutGenerateOutboundTasks(keys);
- //}
-
- /// <summary>
- /// 鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PPCutOutGenerateOutboundTasks"), AllowAnonymous]
- public WebResponseContent PPCutOutGenerateOutboundTasks(int orderDetailId, [FromBody] List<PPStockSelectViewDTO> stockSelectViews)
- {
- return _taskService.PPCutOutGenerateOutboundTasks(orderDetailId, stockSelectViews);
- }
-
- /// <summary>
- /// PP骞冲簱鐩存帴鍑哄簱
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PPGeneratePKOutboundTask"), AllowAnonymous]
- public WebResponseContent PPGeneratePKOutboundTask(int orderDetailId, [FromBody] List<PPStockSelectViewDTO> stockSelectViews)
- {
- return _taskService.PPGeneratePKOutboundTask(orderDetailId, stockSelectViews);
- }
-
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPCutOutboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPCutOutboundOrderController.cs"
deleted file mode 100644
index 4053ad1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPCutOutboundOrderController.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// PP浠撳皬鍗稭ES鍑哄簱鍗�
- /// </summary>
- [Route("api/mesPPCutOutboundOrder")]
- [ApiController]
- public class MesPPCutOutboundOrderController : ApiBaseController<IMesPPCutOutboundOrderService, Dt_MesPPCutOutboundOrder>
- {
- public MesPPCutOutboundOrderController(IMesPPCutOutboundOrderService service) : base(service)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPCutOutboundOrderDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPCutOutboundOrderDetailController.cs"
deleted file mode 100644
index 2106a42..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPCutOutboundOrderDetailController.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// PP浠撳皬鍗稭ES鍑哄簱鍗�
- /// </summary>
- [Route("api/mesPPCutOutboundOrderDetail")]
- [ApiController]
- public class MesPPCutOutboundOrderDetailController : ApiBaseController<IMesPPCutOutboundOrderDetailService, Dt_MesPPCutOutboundOrderDetail>
- {
- public MesPPCutOutboundOrderDetailController(IMesPPCutOutboundOrderDetailService service) : base(service)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPOutboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPOutboundOrderController.cs"
deleted file mode 100644
index ede9c81..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPOutboundOrderController.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// MES鍑哄簱鍗�
- /// </summary>
- [Route("api/mesPPOutboundOrder")]
- [ApiController]
- public class MesPPOutboundOrderController : ApiBaseController<IMesPPOutboundOrderService, Dt_MesPPOutboundOrder>
- {
- public MesPPOutboundOrderController(IMesPPOutboundOrderService service) : base(service)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPOutboundOrderDetailController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPOutboundOrderDetailController.cs"
deleted file mode 100644
index b603c4e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/MesPPOutboundOrderDetailController.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// PP浠撳ぇ鍗稭ES鍑哄簱鍗�
- /// </summary>
- [Route("api/mesPPOutboundOrderDetail")]
- [ApiController]
- public class MesPPOutboundOrderDetailController : ApiBaseController<IMesPPOutboundOrderDetailService, Dt_MesPPOutboundOrderDetail>
- {
- public MesPPOutboundOrderDetailController(IMesPPOutboundOrderDetailService service) : base(service)
- {
-
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/SolderMaskStockController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/SolderMaskStockController.cs"
deleted file mode 100644
index 72dc2c9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/SolderMaskStockController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Stock
-{
- /// <summary>
- /// 闃荤剨搴撳瓨
- /// </summary>
- [Route("api/SolderMaskStock")]
- [ApiController]
- public class SolderMaskStockController : ApiBaseController<ISolderMaskStockService, Dt_SolderMaskStock>
- {
- public SolderMaskStockController(ISolderMaskStockService service) : base(service)
- {
- }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
index d4db578..a06defd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
@@ -47,29 +47,6 @@
}
/// <summary>
- /// 鏌ヨPP绔嬪簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materlCode"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PPGetStockSelectViews")]
- public List<PPStockSelectViewDTO> PPGetStockSelectViews(int orderId, string materielCode)
- {
- return Service.PPGetStockSelectViews(orderId, materielCode);
- }
-
- /// <summary>
- /// 鏌ヨ璁㈠崟PP骞冲簱搴撳瓨瑙嗗浘
- /// </summary>
- /// <param name="orderId"></param>
- /// <param name="materielCode"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PPGetPKStockSelectViews")]
- public List<PPStockSelectViewDTO> PPGetPKStockSelectViews(int orderId, string materielCode)
- {
- return Service.PPGetPKStockSelectViews(orderId, materielCode);
- }
- /// <summary>
/// 鏍规嵁鎵樼洏鍜屽簱鍖烘煡璇㈠簱瀛樹俊鎭�
/// </summary>
/// <param name="saveModel"></param>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile2.pubxml" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile2.pubxml"
new file mode 100644
index 0000000..36847ea
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile2.pubxml"
@@ -0,0 +1,17 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <DeleteExistingFiles>false</DeleteExistingFiles>
+ <ExcludeApp_Data>false</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\211\251\346\226\231\344\272\214\347\273\264\347\240\201\350\247\204\345\210\231.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\211\251\346\226\231\344\272\214\347\273\264\347\240\201\350\247\204\345\210\231.xlsx"
new file mode 100644
index 0000000..e5419c6
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\211\251\346\226\231\344\272\214\347\273\264\347\240\201\350\247\204\345\210\231.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\211\251\346\226\231\347\274\226\347\240\201\350\247\204\345\210\23120250618.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\211\251\346\226\231\347\274\226\347\240\201\350\247\204\345\210\23120250618.xlsx"
new file mode 100644
index 0000000..4cc1c85
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\211\251\346\226\231\347\274\226\347\240\201\350\247\204\345\210\23120250618.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\346\234\272\345\231\250\344\272\272IO\351\200\232\350\256\257\350\241\25020250712.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\346\234\272\345\231\250\344\272\272IO\351\200\232\350\256\257\350\241\25020250712.xlsx"
index aba2de6..9f35452 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\346\234\272\345\231\250\344\272\272IO\351\200\232\350\256\257\350\241\25020250712.xlsx"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\346\234\272\345\231\250\344\272\272IO\351\200\232\350\256\257\350\241\25020250712.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\256\276\345\244\207\351\200\232\350\256\257\345\215\217\350\256\256.xls" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\256\276\345\244\207\351\200\232\350\256\257\345\215\217\350\256\256.xls"
index 07f75f1..fb28a9d 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\256\276\345\244\207\351\200\232\350\256\257\345\215\217\350\256\256.xls"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\256\276\345\244\207\351\200\232\350\256\257\345\215\217\350\256\256.xls"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\275\257\344\273\266\350\256\241\345\210\222\350\241\250.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\275\257\344\273\266\350\256\241\345\210\222\350\241\250.xlsx"
index 77180d8..aa60865 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\275\257\344\273\266\350\256\241\345\210\222\350\241\250.xlsx"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\351\276\231\345\210\251\345\276\227\350\275\257\344\273\266\350\256\241\345\210\222\350\241\250.xlsx"
Binary files differ
--
Gitblit v1.9.3