From 637e23e7df2eb7e9e3dc630f3cf4e212017c7e18 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 28 八月 2025 16:59:21 +0800
Subject: [PATCH] 更新最新代码
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/StackerCraneJob_CP.cs | 8
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs | 40 -
项目资料/接口协议/博斯通利拓接口.xlsx | 0
项目代码/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json | 4
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs | 1
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs | 1
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs | 6
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPB.cs | 12
项目代码/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj | 4
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 127 ----
项目代码/WMS/WMSServices/WIDESEA_Common/APIEnum/APIEnum.cs | 57 --
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs | 2
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService_Operate.cs | 10
项目代码/WMS/WMSServices/WIDESEA_DTO/Basic/BSTMaterialDTO.cs | 95 +++
项目代码/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs | 19
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs | 1
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs | 1
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs | 31 -
项目资料/通信协议/成品输送线通讯协议_20250707.xlsx | 0
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob_CP.cs | 47 +
项目代码/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs | 6
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 1
项目资料/接口协议/一期BSTERP需求字段.xlsx | 0
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/原料库/ConveyorLineJob_YL1ndFloor.cs | 3
项目代码/WMS/WMSServices/WIDESEA_External/IERPService/IInvokeERPService.cs | 79 --
项目资料/接口协议/博思通ERPJSON数据解析.txt | 726 +++++++++++++++++++++++++
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPA.cs | 2
/dev/null | 82 --
项目代码/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs | 10
项目代码/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs | 274 ---------
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/RGVJob_CP.cs | 5
31 files changed, 915 insertions(+), 739 deletions(-)
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 bd06e10..4d6ca4e 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"
@@ -68,7 +68,7 @@
}
else//鍑哄簱鏀捐揣璇锋眰
{
- var content = PutRequest(secureApplyModel.WbCode, task.PalletType);
+ var content = PutRequest(task.NextAddress, task.PalletType);
if (!content.Status)
{
throw new Exception(content.Message);
@@ -87,7 +87,7 @@
}
else//鍏ュ簱鏀捐揣璇锋眰
{
- var content = PutRequest(secureApplyModel.WbCode, task.TaskNum);
+ var content = PutRequest(task.NextAddress, task.TaskNum);
if (!content.Status)
{
throw new Exception(content.Message);
@@ -315,7 +315,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.AGVStationCode == code);
+ Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == code);
if (stationManger == null)
{
return content.Error($"鏈壘鍒扮珯鍙伴厤缃�");
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 18b5d76..f8ed64e 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"
@@ -14,10 +14,10 @@
//杩炴帴瀛楃涓�
//"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",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "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",
//"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=TestWCS_TC;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=TESTWCSCP_WCS;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"WMSConnectionStrings": "Data Source=10.30.4.92;Initial Catalog=WIDESEAWMS_HUAIAN;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_Operate.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService_Operate.cs"
index 9e80cd0..f4209fe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService_Operate.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService_Operate.cs"
@@ -99,11 +99,11 @@
BaseDal.UpdateData(task);
//鍚屾鍒癢MS
- string address = AppSettings.Get("WMSApiAddress");
- if (!string.IsNullOrEmpty(address))
- {
- HttpHelper.Post($"{address}/api/Task/UpdateTaskInfo", task.Serialize());
- }
+ //string address = AppSettings.Get("WMSApiAddress");
+ //if (!string.IsNullOrEmpty(address))
+ //{
+ // HttpHelper.Post($"{address}/api/Task/UpdateTaskInfo", task.Serialize());
+ //}
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, stringBuilder.ToString());
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs"
index e2fc1d9..30ebadb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/ConveyorLineJob_YL1ndFloor.cs"
@@ -67,10 +67,9 @@
if (flag && value != null)
{
OtherDevice device = (OtherDevice)value;
+ //鑾峰彇鎵�鏈夊崗璁殑杈撻�佺嚎绔欏彴
List<string> deviceStations = device.DeviceProDTOs.Select(x => x.DeviceChildCode).ToList();
- //鑾峰彇鏈夊崗璁殑杈撻�佺嚎-z
List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode);
- //璁╂瘡涓緭閫佺嚎鍚姩-z
foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode)))
{
DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(WR_CLineYLDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
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_CPA.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_CPA.cs"
index 2584f47..72c964a 100644
--- "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_CPA.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_CPA.cs"
@@ -83,7 +83,7 @@
if (task != null)
{
//鍒嗛厤璐т綅
- string? local = _taskService.RequestAssignLocation(task.TaskNum, task.Roadway);
+ string? local = "SC01_CP-002-064-008-01";
if (!string.IsNullOrEmpty(local))
{
task.CurrentAddress = item.StackerCraneStationCode;
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_CPB.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_CPB.cs"
index d04c373..f802375 100644
--- "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_CPB.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_CPB.cs"
@@ -84,10 +84,10 @@
if (task != null)
{
//鍒嗛厤宸烽亾 瀛樺叆鎵樼洏鏁版嵁
- string roadWay = _taskService.AssignCPRoadwayNo().Data.ToString();
- if (!string.IsNullOrEmpty(roadWay))
- {
- List<Dt_Router> routers = _routerService.QueryNextRoutes(item.StationCode, roadWay, task.TaskType);
+ //string roadWay = _taskService.AssignCPRoadwayNo().Data.ToString();
+ //if (!string.IsNullOrEmpty(roadWay))
+ //{
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(item.StationCode, "SC01_CP", task.TaskType);
Dt_Router? router = routers.FirstOrDefault();
if (routers == null || routers.Count == 0 || router == null)
{
@@ -105,11 +105,11 @@
task.CurrentAddress = item.StationCode;
task.NextAddress = router.NextPosi;
task.PalletCode = DateTime.Now.ToString("yyMMddHHmmss");//todo涓存椂
- task.Roadway = roadWay;
+ task.Roadway = "SC01_CP";
task.DeviceCode = router.ChildPosiDeviceCode;
_taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);
WriteInfo(item.StationName, $"浠诲姟鍙穥conveyorLineInfoRead.TaskNo}涓嬩竴姝�");
- }
+ //}
}
}
}
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/RGVJob_CP.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/RGVJob_CP.cs"
index b9bb207..4663e0d 100644
--- "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/RGVJob_CP.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/RGVJob_CP.cs"
@@ -71,11 +71,14 @@
DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == device.DeviceCode && x.DeviceProParamType == nameof(R_RgvCPDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == device.DeviceCode && x.DeviceProParamType == nameof(W_RgvCPDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- Console.WriteLine(DateTime.Now.ToString("yyyy-mm-ddd HH:mm:ss"));
if (deviceProRead != null && deviceProWrite != null)
{
R_RGVCPInfo rgvInfoRead = device.Communicator.ReadCustomer<R_RGVCPInfo>(deviceProRead.DeviceProAddress);
W_RGVCPInfo rgvInfoWrite = device.Communicator.ReadCustomer<W_RGVCPInfo>(deviceProWrite.DeviceProAddress);
+ if (rgvInfoRead==null || rgvInfoWrite==null)
+ {
+ return Task.CompletedTask;
+ }
if ((rgvInfoRead.Mode == 5 || rgvInfoRead.Mode == 4) && rgvInfoRead.State == 0 && rgvInfoRead.TaskDone==1)
{
//鑾峰彇浠诲姟 鏄惁鏈塕GV鎵ц鐨勪换鍔�
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/StackerCraneJob_CP.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/StackerCraneJob_CP.cs"
index 35e320b..50e9cba 100644
--- "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/StackerCraneJob_CP.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/StackerCraneJob_CP.cs"
@@ -249,12 +249,18 @@
if (device != null)
{
OtherDevice client = (OtherDevice)device;
- if (client.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode)==3)//鍑哄簱绔欏彴鏈鍗犵敤
+ short command = client.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode);
+ if (command==3)//鍑哄簱绔欏彴鏈鍗犵敤
{
task.NextAddress = stationManger.StackerCraneStationCode;
_taskRepository.UpdateData(task);
return task;
}
+ else
+ {
+ task.ExceptionMessage = "鍑哄簱绔欏彴鏃犳硶涓嬪彂";
+ _taskRepository.UpdateData(task);
+ }
}
else
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
index 7551321..b81985b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
@@ -92,11 +92,19 @@
Thread.Sleep(500);
device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 0);
}
+ if (R_MDQtys2==18)
+ {
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSend2.ToString()).DeviceProDataBlock, 2);
+ }
+ if (R_MDStatus2 == 2)
+ {
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSend2.ToString()).DeviceProDataBlock, 0);
+ }
//鑾峰彇褰撳墠浠诲姟
Dt_Task task = _taskRepository.QueryData(x => x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.MD_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode).OrderBy(x=>x.TaskNum).First();
if (task!=null) //鐮佸灈鐢宠
{
- if ((Allow==3 || Allow == 7)&& item.StackerCraneStationCode == "1")
+ if ((Allow==3 || Allow == 7))
{
if ( R_MDQtys1 / 6 ==1)
{
@@ -110,39 +118,46 @@
{
device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDZ.ToString()).DeviceProDataBlock, 0);
}
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x=>x.DeviceProParamName== W_MDDB.W_MDSend1.ToString()).DeviceProDataBlock,1);
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSendID.ToString()).DeviceProDataBlock, 1);
+ if (item.StackerCraneStationCode == "1")
+ {
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSend1.ToString()).DeviceProDataBlock, 1);
+ }
+ else if (item.StackerCraneStationCode == "2")
+ {
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSend2.ToString()).DeviceProDataBlock, 1);
+ }
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSendID.ToString()).DeviceProDataBlock, Convert.ToInt16(item.StackerCraneStationCode));
if (R_MDQtys1 % 6==0)
{
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1675);
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, 1137);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1670);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, -1140);
}
else if (R_MDQtys1 % 6 == 1)
{
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1675);
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, 1462);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1670);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, -1480);
}
else if (R_MDQtys1 % 6 == 2)
{
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1675);
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, 1787);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1670);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, -1820);
}
else if (R_MDQtys1 % 6 == 3)
{
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1250);
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, 1137);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1243);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, -1140);
}
else if (R_MDQtys1 % 6 == 4)
{
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1250);
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, 1462);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1243);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, -1480);
}
else if (R_MDQtys1 % 6 == 5)
{
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1250);
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, 1787);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, 1243);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, -1820);
}
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDA.ToString()).DeviceProDataBlock, 1);
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDA.ToString()).DeviceProDataBlock, item.StackerCraneStationCode.ObjToInt());
device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 3);
//鏇存柊浠诲姟淇℃伅
//_taskService.TaskCompleted(task.TaskNum);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
index 6f95a6e..629ba5e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
@@ -15,12 +15,29 @@
{
private readonly IBasicRepository _basicRepository;
+ public IMaterielInfoRepository Repository => BaseDal;
+
public MaterielInfoService(IMaterielInfoRepository BaseDal, IBasicRepository basicRepository) : base(BaseDal)
{
_basicRepository = basicRepository;
}
+ /// <summary>
+ /// 娣诲姞鑰佸巶鐗╂枡淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent AddMaterial()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
- public IMaterielInfoRepository Repository => BaseDal;
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/APIEnum/APIEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/APIEnum/APIEnum.cs"
index aa2255b..e8d1e48 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/APIEnum/APIEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/APIEnum/APIEnum.cs"
@@ -8,65 +8,10 @@
namespace WIDESEA_Common.APIEnum
{
/// <summary>
- ///
+ /// 鎺ュ彛
/// </summary>
public enum APIEnum
{
- /// <summary>
- /// AGV鍙戦�佷换鍔℃帴鍙�
- /// </summary>
- [Description("AGV鍙戦�佷换鍔℃帴鍙�")]
- AgvSendTask,
- /// <summary>
- /// AGV瀹夊叏淇″彿鍥炲
- /// </summary>
- [Description("AGV瀹夊叏淇″彿鍥炲")]
- AgvSecureReply,
- /// <summary>
- /// ERP鎺ュ彛璋冪敤
- /// </summary>
- [Description("ERP鎺ュ彛璋冪敤")]
- InvokeErpApi,
- /// <summary>
- /// ERP鎴愬搧璁㈠崟瀹㈡埛鏌ヨ鎺ュ彛璋冪敤
- /// </summary>
- [Description("ERP鎴愬搧璁㈠崟瀹㈡埛鏌ヨ鎺ュ彛璋冪敤")]
- InvokeErpSaleCustomApi,
- /// <summary>
- /// ERP鎴愬搧鍑哄簱璁㈠崟鍑哄簱搴撳瓨鏌ヨ鎺ュ彛璋冪敤
- /// </summary>
- [Description("ERP鎴愬搧璁㈠崟瀹㈡埛鏌ヨ鎺ュ彛璋冪敤")]
- InvokeErpOutProErpSyncApi,
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ鎺ュ彛
- /// </summary>
- [Description("ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ鎺ュ彛")]
- InvokeProInErpStatic,
- /// <summary>
- /// MES鍚屾娴嬭瘯鏋跺彴璐︿俊鎭�
- /// </summary>
- [Description("MES鍚屾娴嬭瘯鏋跺彴璐︿俊鎭�")]
- WMS_MES_TestToolSync,
- /// <summary>
- /// MES鍚屾鏉挎枡鍑哄簱
- /// </summary>
- [Description("MES鍚屾鏉挎枡鍑哄簱")]
- WMS_MES_MaterialLotaAcept,
- /// <summary>
- /// MES鎺ュ彛鑾峰彇鎵规淇℃伅ZH
- /// </summary>
- [Description("MES鎺ュ彛鑾峰彇鎵规淇℃伅ZH")]
- WMS_MES_GetProductByLot,
- /// <summary>
- /// MES鍚屾鎴愬搧鍑哄簱
- /// </summary>
- [Description("MES鍚屾鎴愬搧鍑哄簱")]
- WMS_MES_ShipmentOrderSync,
- /// <summary>
- /// 搴撳瓨鏉垮嚭搴�
- /// </summary>
- [Description("搴撳瓨鏉垮嚭搴�")]
- WMS_MES_ProductOutBound,
/// <summary>
/// 鍥炶皟WCS浠诲姟瀹屾垚
/// </summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/CommonEnum/RecyclingEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/CommonEnum/RecyclingEnum.cs"
deleted file mode 100644
index a2344cd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/CommonEnum/RecyclingEnum.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Common.CommonEnum
-{
- /// <summary>
- /// 鍥炴敹绫诲瀷
- /// </summary>
- public enum RecyclingEnum
- {
- /// <summary>
- /// 瀹緵
- /// </summary>
- Return,
- /// <summary>
- /// 鍥炴敹
- /// </summary>
- RepairStock,
- /// <summary>
- /// 鍥為��
- /// </summary>
- CMStock,
- /// <summary>
- /// 缁翠慨鐗╂枡鍥炴敹
- /// </summary>
- RMStock
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/BSTMaterialDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/BSTMaterialDTO.cs"
new file mode 100644
index 0000000..7944faa
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/BSTMaterialDTO.cs"
@@ -0,0 +1,95 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.Attributes;
+
+namespace WIDESEA_DTO.Basic
+{
+ /// <summary>
+ /// 鍗氭�濋�氱墿鏂欐帴鏀跺疄浣�
+ /// </summary>
+ [ModelValidate]
+ public class BSTMaterialDTO
+ {
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷<br/>
+ /// </summary>
+ [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true)]
+ public int Way { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍞竴鏍囪瘑ID<br/>
+ /// </summary>
+ [PropertyValidate("鐗╂枡鍞竴鏍囪瘑ID", NotNullAndEmpty = true)]
+ public int MaterialId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
+ public string MaterialNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [PropertyValidate("鐗╂枡鍚嶇О", NotNullAndEmpty = true)]
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [PropertyValidate("鐗╂枡瑙勬牸", NotNullAndEmpty = false)]
+ public string Spec { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ [PropertyValidate("鐗╂枡绫诲瀷", NotNullAndEmpty = true)]
+ public int MaterielType { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ /// </summary>
+ [PropertyValidate("鑱旂郴鐢佃瘽", NotNullAndEmpty = true)]
+ public string ContactNumber { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鍦板潃
+ /// </summary>
+ [PropertyValidate("鑱旂郴鍦板潃", NotNullAndEmpty = true)]
+ public string ContactAddress { get; set; }
+
+ /// <summary>
+ /// 鐢靛瓙閭
+ /// </summary>
+ [PropertyValidate("鐢靛瓙閭", NotNullAndEmpty = true)]
+ public string Email { get; set; }
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ [PropertyValidate("鎻忚堪", NotNullAndEmpty = true)]
+ public string Description { get; set; }
+
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ [PropertyValidate("鐘舵��", NotNullAndEmpty = true)]
+ public int State { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ [PropertyValidate("搴撳瓨缁勭粐", NotNullAndEmpty = true)]
+ public string InvOrgId { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 0, 1, 2 })]
+ public string OperateType { get; set; }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/CachePointGroupDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/CachePointGroupDTO.cs"
deleted file mode 100644
index edd66c5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/CachePointGroupDTO.cs"
+++ /dev/null
@@ -1,35 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Basic
-{
- public class CachePointGroupDTO
- {
- public int IdA { get; set; }
-
- public int IdB { get; set; }
-
- public string PointCodeA { get; set; }
-
- public string PointCodeB { get; set; }
-
- public int PointTypeA { get; set; }
-
- public int PointTypeB { get; set; }
-
- public int PointStatusA { get; set; }
-
- public int PointStatusB { get; set; }
-
- public int DepthA { get; set; }
-
- public int DepthB { get; set; }
-
- public int EnableStatusA { get; set; }
-
- public int EnableStatusB { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/InnerCodeDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/InnerCodeDTO.cs"
deleted file mode 100644
index 3d2e1a6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/InnerCodeDTO.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Basic
-{
- public class InnerCodeDTO
- {
- public string matCode { get; set; }
- public string batchNo { get; set; }
- public string purchaseOrderNo { get; set; }
- public int qty { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/ProSerNumAnalysisModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/ProSerNumAnalysisModel.cs"
deleted file mode 100644
index 26a3fd9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Basic/ProSerNumAnalysisModel.cs"
+++ /dev/null
@@ -1,52 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- /// 鎴愬搧鍐呭鍖呯爜瑙ｆ瀽
- /// </summary>
- [AnalysisRule, ModelValidate]
- public class ProSerNumAnalysisModel
- {
- /// <summary>
- /// 鍐呭寘鍙�
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.MTC), PropertyValidate("鍐呭寘鍙�", NotNullAndEmpty = true)]
- public string BagNO { get; set; }
-
- /// <summary>
- /// 浜у搧鍙�
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.BHN), PropertyValidate("浜у搧鍙�", NotNullAndEmpty = true)]
- public string ProductCode { get; set; }
-
- /// <summary>
- /// 鍛ㄦ湡
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.DC), PropertyValidate("鍛ㄦ湡", NotNullAndEmpty = true)]
- public string DateCode { get; set; }
-
- /// <summary>
- /// X鏉挎暟
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.ED), PropertyValidate("X鏉挎暟", NotNullAndEmpty = true)]
- public string XQty { get; set; }
-
- /// <summary>
- /// PCS鏁伴噺
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.PCSQ), PropertyValidate("PCS鏁伴噺", NotNullAndEmpty = true)]
- public string OKPCSQTY { get; set; }
- /// <summary>
- /// 鍘熷鏁版嵁
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.BD), PropertyValidate("鍘熷鏁版嵁", NotNullAndEmpty = true)]
- public string SerialNumber { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpInOrderDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpInOrderDTO.cs"
deleted file mode 100644
index 2846683..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpInOrderDTO.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍏朵粬鍏ュ簱璁㈠崟
- /// </summary>
- [ModelValidate]
- public class ErpInOrderDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷<br/>
- /// 1锛氭柊澧�<br/>
- /// 2锛氫慨鏀�<br/>
- /// 3锛氬垹闄�(鍒犻櫎鍙鏄庣粏琛屽彿鍜岄鏂欏崟鍙�)
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int Way { get; set; }
-
- /// <summary>
- /// 鏄庣粏琛屽彿
- /// </summary>
- [PropertyValidate("鏄庣粏琛屽彿", NotNullAndEmpty = true)]
- public string RowNo { get; set; }
-
- /// <summary>
- /// 鍏ュ簱璁㈠崟鍙�
- /// </summary>
- [PropertyValidate("鍏ュ簱璁㈠崟鍙�", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)]
- public string WaId { get; set; }
-
- /// <summary>
- /// 璁㈠崟绫诲瀷<br/>
- /// 1锛氳皟鎷ㄥ叆搴�<br/>
- /// 3锛氬渚涘洖鏀�<br/>
- /// 6锛氱墿鏂欓攢鍞��璐�<br/>
- /// </summary>
- [PropertyValidate("璁㈠崟绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 3, 6 })]
- public int OType { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [PropertyValidate("鐗╂枡缂栫爜", NotNullAndEmpty = true)]
- public string MCode { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [PropertyValidate("鏁伴噺", NotNullAndEmpty = true, MinValue = 0, IsContainMinValue = false)]
- public float Qty { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
-
- /// <summary>
- /// 涓嬪崟鏃ユ湡
- /// </summary>
- [PropertyValidate("涓嬪崟鏃ユ湡", NotNullAndEmpty = true)]
- public string OrderData { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [PropertyValidate("澶囨敞")]
- public string Note { get; set; }
-
- /// <summary>
- /// 鍥炴敹绫诲瀷
- /// </summary>
- [PropertyValidate("鍥炴敹绫诲瀷")]
- public string Type { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs"
deleted file mode 100644
index dc8bd94..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs"
+++ /dev/null
@@ -1,106 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_DTO.Basic;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍑哄簱鍗�
- /// </summary>
- [ModelValidate]
- public class ErpOutOrderDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷<br/>
- /// 1锛氭柊澧�<br/>
- /// 2锛氫慨鏀�<br/>
- /// 3锛氬垹闄�(鍒犻櫎鍙鏄庣粏琛屽彿鍜岄鏂欏崟鍙�)
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int Way { get; set; }
-
- /// <summary>
- /// 鏄庣粏琛屽彿
- /// </summary>
- [PropertyValidate("鏄庣粏琛屽彿", NotNullAndEmpty = true)]
- public string RowNo { get; set; }
-
- /// <summary>
- /// 棰嗘枡璁㈠崟鍙�
- /// </summary>
- [PropertyValidate("棰嗘枡璁㈠崟鍙�", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)]
- public string WaId { get; set; }
-
- /// <summary>
- /// 璁㈠崟绫诲瀷<br/>
- /// 1锛氭爣鍑嗙敓浜ч鏂�<br/>
- /// 2锛氭爣鍑嗛儴闂ㄩ鏂�<br/>
- /// 3锛氱爺鍙戦」鐩鏂�<br/>
- /// 4锛氱墿鏂欓�佹鍑轰粨<br/>
- /// 5锛氱墿鏂欒皟鍑�<br/>
- /// 6锛氱淮淇彂鏂�<br/>
- /// 7锛氶攢鍞锤鏄�<br/>
- /// 8锛氶��璐х鐞�
- /// </summary>
- [PropertyValidate("璁㈠崟绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3, 4, 5, 6, 7, 8 })]
- public int OType { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [PropertyValidate("鐗╂枡缂栫爜", NotNullAndEmpty = true)]
- public string MCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [PropertyValidate("鐗╂枡鎵规")]
- public string MLot { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [PropertyValidate("鏁伴噺", NotNullAndEmpty = true, MinValue = 0, IsContainMinValue = false)]
- public float Qty { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
-
- /// <summary>
- /// 涓嬪崟鏃ユ湡
- /// </summary>
- [PropertyValidate("涓嬪崟鏃ユ湡", NotNullAndEmpty = true)]
- public string OrderData { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [PropertyValidate("澶囨敞")]
- public string Node { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [PropertyValidate("閮ㄩ棬缂栧彿")]
- public string DepartmentCode { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [PropertyValidate("閮ㄩ棬鍚嶇О")]
- public string DepartmentName { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpOutProSyncResponseContent.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpOutProSyncResponseContent.cs"
deleted file mode 100644
index 949af31..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpOutProSyncResponseContent.cs"
+++ /dev/null
@@ -1,85 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鎴愬搧搴撳瓨鎺ユ敹杩斿弬
- /// </summary>
- public class ErpOutProSyncResponseContent
- {
- /// <summary>
- /// 杩斿洖鐮�
- /// </summary>
- public int Code { get; set; }
- /// <summary>
- /// 杩斿洖淇℃伅
- /// </summary>
- public string Msg { get; set; }
- /// <summary>
- /// 搴撳瓨淇℃伅
- /// </summary>
- public List<OutProStock> Data { get; set; }
- }
- /// <summary>
- /// 搴撳瓨淇℃伅
- /// </summary>
- public class OutProStock
- {
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- public string Factory { get; set; }
- /// <summary>
- /// 鎿嶄綔鍛�
- /// </summary>
- public string EmployeeName { get; set; }
- /// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
- public string PackingSlipNumer { get; set; }
- /// <summary>
- /// 鍑轰粨鏁伴噺
- /// </summary>
- public int Quantity { get; set; }
- /// <summary>
- /// 鍗曟嵁鍙�
- /// </summary>
- public string ShippingNumber { get; set; }
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- public string Partrev { get; set; }
- /// <summary>
- /// 璁㈠崟鍑鸿揣
- /// </summary>
- public string OutType { get; set; }
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- public string WarehouseName { get; set; }
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 鐢熶骇鍨嬪彿
- /// </summary>
- public string Partnum { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- public string SoNumber { get; set; }
- /// <summary>
- /// 瑁呰繍鏃ユ湡
- /// </summary>
- public string ShippedDate { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string BatchNumber { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProInErpStaticResponseContent.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProInErpStaticResponseContent.cs"
deleted file mode 100644
index 7d477a2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProInErpStaticResponseContent.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鎴愬搧搴撳瓨闈㈢Н鎺ユ敹杩斿弬
- /// </summary>
- public class ErpProInErpStaticResponseContent
- {
- /// <summary>
- /// 杩斿洖鐮�
- /// </summary>
- public int Code { get; set; }
- /// <summary>
- /// 杩斿洖淇℃伅
- /// </summary>
- public string Msg { get; set; }
- /// <summary>
- /// 搴撳瓨淇℃伅
- /// </summary>
- public List<ProInStatic> Data { get; set; }
- }
- /// <summary>
- /// 鍙傛暟
- /// </summary>
- public class ProInStatic
- {
- /// <summary>
- /// 鐢熶骇鐗堟湰
- /// </summary>
- public string PartRev { get; set; }
- /// <summary>
- /// 鐢熶骇鍨嬪彿
- /// </summary>
- public string PartNum { get; set; }
- /// <summary>
- /// 鐩墠鍥哄畾涓�1
- /// </summary>
- public string Jbfl { get; set; }
- /// <summary>
- /// 鍗曞厓闈㈢Н
- /// </summary>
- public float UnitArea { get; set; }
- /// <summary>
- /// 鐢熶骇鍨嬪彿+鐢熶骇鐗堟湰
- /// </summary>
- public string PartNumWithRev { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProOutLingOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProOutLingOrder.cs"
deleted file mode 100644
index a9a2c99..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProOutLingOrder.cs"
+++ /dev/null
@@ -1,71 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鎴愬搧棰嗘枡鍑哄簱
- /// </summary>
- public class ErpProOutLingOrder
- {
- /// <summary>
- ///
- /// </summary>
- public int RowId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string OrderNo { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string PCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string PVer { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string PLot { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int DateCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string WaType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public float SetQty { get; set; }
- /// <summary>
- ///
- /// </summary>
- public float QtyPcs { get; set; }
- /// <summary>
- ///
- /// </summary>
- public float XQty { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string XSite { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Unit { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string OrderDate { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Note { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProOutOrderDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProOutOrderDTO.cs"
deleted file mode 100644
index 13015cb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProOutOrderDTO.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鎴愬搧璁㈠崟鍑哄簱
- /// </summary>
- public class ErpProOutOrderDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷<br/>
- /// 1锛氭柊澧�<br/>
- /// 2锛氫慨鏀�<br/>
- /// 3锛氬垹闄�(鍒犻櫎鍙鏄庣粏琛屽彿鍜岄鏂欏崟鍙�)
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int Way { get; set; }
- /// <summary>
- /// 鍑哄簱璁㈠崟鍙�
- /// </summary>
- [PropertyValidate("鍑哄簱璁㈠崟鍙�", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
- /// <summary>
- /// 璁㈠崟绫诲瀷<br/>
- /// 1锛氬嚭搴撳崟<br/>
- /// 2锛氬瘎鍞鍗曡浆浠�<br/>
- /// </summary>
- [PropertyValidate("璁㈠崟绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2})]
- public int OType { get; set; }
- /// <summary>
- /// 浠撳簱绫诲瀷
- /// </summary>
- public string WaType { get; set; }
- /// <summary>
- /// 璁″垝鍑鸿揣鏃堕棿
- /// </summary>
- public string PlantShipDate { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Note { get; set; }
- /// <summary>
- /// 璇︽儏
- /// </summary>
- public List<ErpProOutOrderDetailds> OrderDetails { get; set; }
- }
- /// <summary>
- /// 璇︾粏
- /// </summary>
- public class ErpProOutOrderDetailds
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowId { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- public string SaleOrder { get; set; }
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- public string Customer { get; set; }
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- public string FactoryCode { get; set; }
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string PCode { get; set; }
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- public string PVer { get; set; }
- /// <summary>
- /// 浜у搧鎵规
- /// </summary>
- public string PLot { get; set; }
- /// <summary>
- /// 浜у搧鍛ㄦ湡
- /// </summary>
- public string DateCode { get; set; }
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- public float QtyPcs { get; set; }
- /// <summary>
- /// X鏉挎暟
- /// </summary>
- public float XQty { get; set; }
- /// <summary>
- /// X鏉夸綅
- /// </summary>
- public string XSite { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
- /// <summary>
- /// 澶囧搧鏁�
- /// </summary>
- public float SpareQty { get; set; }
- }
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductScrappedOrderDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductScrappedOrderDTO.cs"
deleted file mode 100644
index de02fa4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductScrappedOrderDTO.cs"
+++ /dev/null
@@ -1,90 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鎴愬搧浠撴鎶ュ簾鍗�
- /// </summary>
- [ModelValidate]
- public class ErpProductScrappedOrderDTO
- {
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- [PropertyValidate("璁㈠崟鍙�", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [PropertyValidate("浜у搧缂栫爜", NotNullAndEmpty = true)]
- public string PCode { get; set; }
-
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- [PropertyValidate("浜у搧鐗堟湰", NotNullAndEmpty = true)]
- public string PVer { get; set; }
-
- /// <summary>
- /// 浜у搧鎵规
- /// </summary>
- [PropertyValidate("浜у搧鎵规", NotNullAndEmpty = true)]
- public string PLot { get; set; }
-
- /// <summary>
- /// 浜у搧鍛ㄦ湡
- /// </summary>
- [PropertyValidate("浜у搧鍛ㄦ湡")]
- public int DateCode { get; set; }
-
- /// <summary>
- /// 浠撳簱绫诲瀷
- /// HA72=灏炬暟浠撱�丠A71=鎴愬搧浠撱�丠A73=鐮斿彂浠�
- /// </summary>
- [PropertyValidate("浠撳簱绫诲瀷", NotNullAndEmpty = true)]
- public string WaType { get; set; }
-
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- [PropertyValidate("鍚堟牸PCS鏁�", NotNullAndEmpty = true)]
- public float QtyPcs { get; set; }
-
- /// <summary>
- /// X鏉挎暟
- /// </summary>
- [PropertyValidate("X鏉挎暟")]
- public float XQty { get; set; }
-
- /// <summary>
- /// X鏉夸綅
- /// </summary>
- [PropertyValidate("X鏉夸綅")]
- public string XSite { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
-
- /// <summary>
- /// 寤哄崟鏃ユ湡
- /// yyyy-MM-dd
- /// </summary>
- [PropertyValidate("寤哄崟鏃ユ湡", NotNullAndEmpty = true)]
- public string OrderDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [PropertyValidate("澶囨敞")]
- public string Note { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductSpecifyVerDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductSpecifyVerDTO.cs"
deleted file mode 100644
index 6ac440b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductSpecifyVerDTO.cs"
+++ /dev/null
@@ -1,71 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鎴愬搧閿�鍞寚娲捐〃
- /// </summary>
- [ModelValidate]
- public class ErpProductSpecifyVerDTO
- {
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- [PropertyValidate("璁㈠崟鍙�", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鏄庣粏琛屽彿
- /// </summary>
- [PropertyValidate("鏄庣粏琛屽彿", NotNullAndEmpty = true)]
- public int RowId { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [PropertyValidate("浜у搧缂栫爜", NotNullAndEmpty = true)]
- public string PCode { get; set; }
-
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- [PropertyValidate("浜у搧鐗堟湰", NotNullAndEmpty = true)]
- public string PVer { get; set; }
-
- /// <summary>
- /// 浜у搧鎵规
- /// </summary>
- [PropertyValidate("浜у搧鎵规", NotNullAndEmpty = true)]
- public string PLot { get; set; }
-
- /// <summary>
- /// 浜у搧鍛ㄦ湡
- /// </summary>
- [PropertyValidate("浜у搧鍛ㄦ湡")]
- public string DateCode { get; set; }
-
- /// <summary>
- /// 浠撳簱绫诲瀷
- /// HA72=灏炬暟浠撱�丠A71=鎴愬搧浠撱�丠A73=鐮斿彂浠�
- /// </summary>
- [PropertyValidate("浠撳簱绫诲瀷", NotNullAndEmpty = true)]
- public string WaType { get; set; }
-
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- [PropertyValidate("鍚堟牸PCS鏁�", NotNullAndEmpty = true)]
- public float QtyPcs { get; set; }
-
- /// <summary>
- /// 鎸囨淳鐗堟湰鍙�
- /// </summary>
- [PropertyValidate("鎸囨淳鐗堟湰鍙�",NotNullAndEmpty =true)]
- public string Ver { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductTransferOrderDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductTransferOrderDTO.cs"
deleted file mode 100644
index 3d0c692..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductTransferOrderDTO.cs"
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鐮斿彂鎴愬搧璋冨嚭鎴愬搧浠�
- /// </summary>
- [ModelValidate]
-
- public class ErpProductTransferOrderDTO
- {
- /// <summary>
- /// 璋冩嫧鍗曞彿
- /// </summary>
- [PropertyValidate("璋冩嫧鍗曞彿",NotNullAndEmpty =true)]
- public string TransferNo { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [PropertyValidate("浜у搧缂栫爜", NotNullAndEmpty = true)]
- public string PCode { get; set; }
-
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- [PropertyValidate("浜у搧鐗堟湰", NotNullAndEmpty = true)]
- public string PVer { get; set; }
-
- /// <summary>
- /// 浜у搧鎵规
- /// </summary>
- [PropertyValidate("浜у搧鎵规", NotNullAndEmpty = true)]
- public string PLot { get; set; }
-
- /// <summary>
- /// 浜у搧鍛ㄦ湡
- /// </summary>
- [PropertyValidate("浜у搧鍛ㄦ湡")]
- public string DateCode { get; set; }
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- [PropertyValidate("鍚堟牸PCS鏁�", NotNullAndEmpty = true)]
- public float QtyPcs { get; set; }
-
- /// <summary>
- /// X鏉挎暟
- /// </summary>
- [PropertyValidate("X鏉挎暟")]
- public float XQty { get; set; }
-
- /// <summary>
- /// X鏉夸綅
- /// </summary>
- [PropertyValidate("X鏉夸綅")]
- public int XSite { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅",NotNullAndEmpty =true)]
- public string Unit { get; set; }
-
- /// <summary>
- /// 寤哄崟鏃ユ湡
- /// yyyy-MM-dd
- /// </summary>
- [PropertyValidate("寤哄崟鏃ユ湡",NotNullAndEmpty =true)]
- public string OrderDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [PropertyValidate("澶囨敞")]
- public string Note { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [PropertyValidate("閿�鍞鍗曞彿",NotNullAndEmpty =true)]
- public string SaleOrder { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [PropertyValidate("瀹㈡埛", NotNullAndEmpty =true)]
- public string Customer { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [PropertyValidate("宸ュ巶", NotNullAndEmpty =true)]
- public string FactoryCode { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductWarehousingOrderDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductWarehousingOrderDTO.cs"
deleted file mode 100644
index 916f7d7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpProductWarehousingOrderDTO.cs"
+++ /dev/null
@@ -1,107 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鎴愬搧璋冨叆/閿�鍞浆鍏ュ緟鍙戣揣浠�
- /// </summary>
- [ModelValidate]
- public class ErpProductWarehousingOrderDTO
- {
- /// <summary>
- /// 璋冩嫧鍗曞彿
- /// </summary>
- [PropertyValidate("璋冩嫧鍗曞彿", NotNullAndEmpty = true)]
- public string TransferNo { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [PropertyValidate("浜у搧缂栫爜", NotNullAndEmpty = true)]
- public string PCode { get; set; }
-
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- [PropertyValidate("浜у搧鐗堟湰", NotNullAndEmpty = true)]
- public string PVer { get; set; }
-
- /// <summary>
- /// 浜у搧鎵规
- /// </summary>
- [PropertyValidate("浜у搧鎵规", NotNullAndEmpty = true)]
- public string PLot { get; set; }
-
- /// <summary>
- /// 浜у搧鍛ㄦ湡
- /// </summary>
- [PropertyValidate("浜у搧鍛ㄦ湡")]
- public string DateCode { get; set; }
-
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- [PropertyValidate("鍚堟牸PCS鏁�", NotNullAndEmpty = true)]
- public float QtyPcs { get; set; }
-
- /// <summary>
- /// 鍖呰Set鏁�
- /// </summary>
- [PropertyValidate("鍖呰Set鏁�", NotNullAndEmpty = true)]
- public float QtySet { get; set; }
-
- /// <summary>
- /// X鏉挎暟
- /// </summary>
- [PropertyValidate("X鏉挎暟")]
- public float XQty { get; set; }
-
- /// <summary>
- /// X鏉夸綅
- /// </summary>
- [PropertyValidate("X鏉夸綅")]
- public string XSite { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅",NotNullAndEmpty =true)]
- public string Unit { get; set; }
-
- /// <summary>
- /// 寤哄崟鏃ユ湡
- /// yyyy-MM-dd
- /// </summary>
- [PropertyValidate("寤哄崟鏃ユ湡",NotNullAndEmpty =true)]
- public string OrderDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [PropertyValidate("澶囨敞")]
- public string Note { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [PropertyValidate("閿�鍞鍗曞彿", NotNullAndEmpty = true)]
- public string SaleOrder { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [PropertyValidate("瀹㈡埛", NotNullAndEmpty = true)]
- public string Customer { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [PropertyValidate("宸ュ巶", NotNullAndEmpty = true)]
- public string FactoryCode { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpReturnOrderDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpReturnOrderDTO.cs"
deleted file mode 100644
index 6a3c68f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpReturnOrderDTO.cs"
+++ /dev/null
@@ -1,127 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鏍囧噯/bom閫�鏂�
- /// </summary>
- [ModelValidate]
- public class ErpReturnOrderDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷<br/>
- /// 1锛氭柊澧�<br/>
- /// 2锛氫慨鏀�<br/>
- /// 3锛氬垹闄�(鍒犻櫎鍙鏄庣粏琛屽彿鍜岄鏂欏崟鍙�)
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int Way { get; set; }
-
- /// <summary>
- /// 閫�鏂欒鍗曞彿
- /// </summary>
- [PropertyValidate("閫�鏂欒鍗曞彿", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)]
- public string WaCode { get; set; }
-
- /// <summary>
- /// 鍗曟嵁澶囨敞
- /// </summary>
- public string? Note { get; set; }
-
- /// <summary>
- /// 璁㈠崟绫诲瀷<br/>
- /// 1锛氭爣鍑嗛��鏂�<br/>
- /// 2锛歜om閫�鏂�<br/>
- /// </summary>
- [PropertyValidate("璁㈠崟绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2 })]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 鏄惁鐮斿彂
- /// 0:鍚�
- /// 1:鏄�
- /// </summary>
- [PropertyValidate("鏄惁鐮斿彂", NotNullAndEmpty = true, Check = new object[] { 0, 1 })]
- public int IsDev { get; set; }
-
- /// <summary>
- /// 鍒楄〃
- /// </summary>
- [PropertyValidate("鍒楄〃", NotNullAndEmpty = true)]
- public List<ReturnDetail> Issitem { get; set; }
- }
- /// <summary>
- /// 閫�鏂欐槑缁�
- /// </summary>
- [ModelValidate]
- public class ReturnDetail
- {
- /// <summary>
- /// 鐢宠鍗曞彿(鍙戞枡鍗�)
- /// </summary>
- [PropertyValidate("鐢宠鍗曞彿", NotNullAndEmpty = true)]
- public string PickCode { get; set; }
-
- /// <summary>
- /// 鐢宠鍗曞彿琛屽彿(鍙戞枡鍗曟槑缁嗚鍙�)
- /// </summary>
- [PropertyValidate("鐢宠鍗曞彿琛屽彿", NotNullAndEmpty = false)]
- public int? ApplyRow { get; set; }
-
- /// <summary>
- /// 閫�鏂欒鍙�
- /// </summary>
- [PropertyValidate("閫�鏂欒鍙�", NotNullAndEmpty = true)]
- public int RowId { get; set; }
-
- /// <summary>
- /// 閫�鏂欎俊鎭�
- /// </summary>
- [PropertyValidate("閫�鏂欎俊鎭�", NotNullAndEmpty = true)]
- public List<ReturnInfo> PickList { get; set; }
- }
- /// <summary>
- /// 閫�鏂欎俊鎭�
- /// </summary>
- [ModelValidate]
- public class ReturnInfo
- {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [PropertyValidate("鐗╂枡缂栫爜", NotNullAndEmpty = true)]
- public string MCode { get; set; }
-
- /// <summary>
- /// 鍙��鏁伴噺
- /// </summary>
- [PropertyValidate("鍙��鏁伴噺", NotNullAndEmpty = true)]
- public float Qty { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
-
- /// <summary>
- /// 閫�鍥炴暟閲�
- /// </summary>
- [PropertyValidate("閫�鍥炴暟閲�", NotNullAndEmpty = true)]
- public float ReturnQty { get; set; }
-
- public string? Code { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpSaleCustomResponseContent.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpSaleCustomResponseContent.cs"
deleted file mode 100644
index bfd257c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/ErpSaleCustomResponseContent.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- public class ErpSaleCustomResponseContent
- {
- /// <summary>
- /// 杩斿洖鐮�
- /// </summary>
- public int Code { get; set; }
- /// <summary>
- /// 杩斿洖淇℃伅
- /// </summary>
- public string Msg { get; set; }
- /// <summary>
- /// 杩斿洖鍊�
- /// </summary>
- public List<SaleNo> Data { get; set; }
- }
- /// <summary>
- /// 瀹㈡埛浠ｅ彿淇℃伅
- /// </summary>
- public class SaleNo
- {
- /// <summary>
- /// 瀹㈡埛浠ｅ彿
- /// </summary>
- public string Endcustomer { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/MaterielInfoDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/MaterielInfoDTO.cs"
deleted file mode 100644
index e06362c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/MaterielInfoDTO.cs"
+++ /dev/null
@@ -1,164 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- [ModelValidate()]
- public class MaterielInfoDTO
- {
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string Code { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string Name { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string StandType { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string ItemType { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string Type { get; set; }
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string ItemSourceType { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string Unit { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string MaterialVersion { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public int Size { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public float Length { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public float Thickness { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public float Wide { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string Model { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string Color { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string MaterialTG { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string Spare1 { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string Spare2 { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string Spare3 { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string Spare4 { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string Spare5 { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string State { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string InvOrgId { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = false)]
- public string OperateType { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = false)]
- public string UserDef01 { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = false)]
- public string UserDef04 { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public int IsCheck { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public string WaId { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/PurchaseOrderModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/PurchaseOrderModel.cs"
deleted file mode 100644
index be24ab9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/PurchaseOrderModel.cs"
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_DTO
-{
-
- /// <summary>
- /// 閲囪喘鍗曟ā鍨�
- /// </summary>
- [ModelValidate]
- public class PurchaseOrderModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷(1:鏂板銆�2:淇敼銆�3:鍒犻櫎銆�4:鍏抽棴[鍒犻櫎銆佸叧闂彧瑕佸崟鍙凤紝宸茬敓鎴愭敹璐у崟鐨勪笉鑳藉垹闄)
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", Check = new object[] { 1, 2, 3, 4 })]
- public int Way { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [PropertyValidate("閲囪喘鍗曞彿", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷(S:鏍囧噯鍏ュ簱銆乂:瀵勫敭琛ョ粰鍏ュ簱)
- /// </summary>
- [PropertyValidate("鍗曟嵁绫诲瀷", NotNullAndEmpty = true, Check = new[] { "S", "V" })]
- public string Type { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗙紪鍙�", NotNullAndEmpty = true)]
- public string SCode { get; set; }
-
- /// <summary>
- /// 閲囪喘鏁伴噺
- /// </summary>
- [PropertyValidate("閲囪喘鏁伴噺", MinValue = 0, IsContainMinValue = false)]
- public float Amount { get; set; }
-
- /// <summary>
- /// 涓嬪崟鏃ユ湡
- /// </summary>
- [PropertyValidate("涓嬪崟鏃ユ湡", NotNullAndEmpty = true)]
- public string OrderDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Note { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍒楄〃
- /// </summary>
- [PropertyValidate("鐗╂枡鍒楄〃", NotNullAndEmpty = true)]
- public List<PurchaseOrderDetailModel> MList { get; set; }
- }
-
- /// <summary>
- /// 閲囪喘鍗曟槑缁嗘ā鍨�
- /// </summary>
- [ModelValidate]
- public class PurchaseOrderDetailModel
- {
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public int RowId { get; set; }
-
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MCode { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)]
- public string WaId { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [PropertyValidate("閲囪喘鏁伴噺", MinValue = 0, IsContainMinValue = false)]
- public float Qty { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/Root.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/Root.cs"
deleted file mode 100644
index ef0b7cf..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/Root.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- [ModelValidate]
- public class Root<T>
- {
- /// <summary>
- ///
- /// </summary>
- public string From { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string DateTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Message { get; set; }
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("鍐呭", NotNullAndEmpty = true)]
- public T Content { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/UserInfoDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/UserInfoDTO.cs"
deleted file mode 100644
index a1ceb33..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/UserInfoDTO.cs"
+++ /dev/null
@@ -1,61 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- [ModelValidate()]
- public class UserInfoDTO
- {
- /// <summary>
- /// 鍛樺伐鍙�
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string Code { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栫爜
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string DeptNo { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string DeptName { get; set; }
-
- /// <summary>
- /// 鍛樺伐鍚嶇О
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string Name { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public int State { get; set; }
-
- /// <summary>
- /// 搴撳瓨缁勭粐
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string InvOrgId { get; set; }
-
- /// <summary>
- /// 绫诲瀷
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public int Type { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [PropertyValidate("", NotNullAndEmpty = true)]
- public string OperateType { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/InboundOrderGetDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/InboundOrderGetDTO.cs"
deleted file mode 100644
index f9defcf..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/InboundOrderGetDTO.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Inbound
-{
- public class InboundOrderGetDTO
- {
- public string OrderNo { get; set; }
- public int pageNo { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/MaterielGroupDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/MaterielGroupDTO.cs"
deleted file mode 100644
index f29b9b9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/MaterielGroupDTO.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Inbound
-{
- [ModelValidate]
- public class MaterielGroupDTO
- {
- [PropertyValidate("鎵樼洏缂栧彿", NotNullAndEmpty = true)]
- public string PalletCode { get; set; }
-
- [PropertyValidate("鍗曟嵁缂栧彿", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- [PropertyValidate("搴忓垪鍙锋潯鐮�", NotNullAndEmpty = true)]
- public List<string> SerialNumbers { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/ProInStaticDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/ProInStaticDTO.cs"
deleted file mode 100644
index 7e81ed0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Inbound/ProInStaticDTO.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Inbound
-{
- /// <summary>
- ///
- /// </summary>
- public class ProInStaticDTO
- {
- public string ProductCode { get; set; }
- public string ProductVersion { get; set; }
- public float SumPcs { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MESRoot.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MESRoot.cs"
deleted file mode 100644
index b7125f4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MESRoot.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- public class MESRoot<T>
- {
- /// <summary>
- ///
- /// </summary>
- public string From { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string DateTime { get; set; }
-
- public T Content { get; set; }
- }
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesBagInfoModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesBagInfoModel.cs"
deleted file mode 100644
index 6e238f2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesBagInfoModel.cs"
+++ /dev/null
@@ -1,141 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES鍐呭寘鍏ュ簱
- /// </summary>
- public class MesBagInfoModel
- {
- /// <summary>
- /// 鑳舵鐮�
- /// </summary>
- public string BatchNo { get; set; }
- /// <summary>
- /// 浠撲綅
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 鎷嗙鍏ュ簱
- /// </summary>
- public int UnPackStock { get; set; }
- /// <summary>
- /// 宸ヤ綔涓績
- /// </summary>
- public string WorkCenter { get; set; }
- /// <summary>
- /// 鍐呭寘淇℃伅
- /// </summary>
- public List<MESBagDetail> BagDetails { get; set; }
- }
- /// <summary>
- /// MES鍐呭寘鍏ュ簱
- /// </summary>
- public class MesBoxInfoModel
- {
- /// <summary>
- /// 澶栫鍙�
- /// </summary>
- public string BoxNo { get; set; }
- /// <summary>
- /// 鍑哄簱鍗曞彿
- /// </summary>
- public string ShipmentOrder { get; set; }
- /// <summary>
- /// 鍑鸿揣鍗曞彿
- /// </summary>
- public List<MESBagDetail> Bags { get; set; }
- }
- /// <summary>
- /// 鍐呭寘淇℃伅
- /// </summary>
- public class MESBagDetail
- {
- /// <summary>
- /// 鍐呭寘鍙�
- /// </summary>
- public string BagNo { get; set; }
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string ProductCode { get; set; }
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- public string ProductVersion { get; set; }
- /// <summary>
- /// 鍖呰SET鏁伴噺
- /// </summary>
- public float SETQty { get; set; }
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- public float OKPCSQTY { get; set; }
- /// <summary>
- /// 鍛ㄦ湡
- /// </summary>
- public string DateCode { get; set; }
- /// <summary>
- /// X鏁�
- /// </summary>
- public float XQty { get; set; }
- /// <summary>
- /// X浣�
- /// </summary>
- public string XSite { get; set; }
- /// <summary>
- /// 鍐呭寘閲嶉噺
- /// </summary>
- public float Weight { get; set; }
- /// <summary>
- /// 鍖呰鏃堕棿
- /// </summary>
- public DateTime PackingDate { get; set; }
- /// <summary>
- /// 鍐呭寘鏄庣粏
- /// </summary>
- public List<MESBagItem> BagItems { get; set; }
- }
- /// <summary>
- /// 鍐呭寘鏄庣粏
- /// </summary>
- public class MESBagItem
- {
- /// <summary>
- /// 鍒堕�犺鍗�
- /// </summary>
- public string MoNumber { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string LotNumber { get; set; }
- /// <summary>
- /// ERP宸ュ崟
- /// </summary>
- public string ERPOrder { get; set; }
- /// <summary>
- /// 閿�鍞鍗�
- /// </summary>
- public string SaleOrder { get; set; }
- /// <summary>
- /// 鍖呰SET鏁伴噺
- /// </summary>
- public float SETQty { get;set; }
- /// <summary>
- /// 鍚堟牸PCS鏁�
- /// </summary>
- public float OKPCSQTY { get; set; }
- /// <summary>
- /// X鏁�
- /// </summary>
- public float XQty { get; set; }
- /// <summary>
- /// X浣�
- /// </summary>
- public string XSite { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesMaterialLotaAceptModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesMaterialLotaAceptModel.cs"
deleted file mode 100644
index ed4d371..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesMaterialLotaAceptModel.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
- /// </summary>
- public class MesMaterialLotaAceptModel
- {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鍘熷鐗╂枡鎵规 渚涘簲鍟嗘壒娆�(MES鎸夌墿鏂欑紪鐮�+鈥�,鈥�+鐗╂枡鎵规鎷兼帴)
- /// </summary>
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public float Quantity { get; set; }
-
- /// <summary>
- /// 绾胯竟搴撳尯
- /// </summary>
- public string WarehouseArea { get; set; }
-
- /// <summary>
- /// 绾胯竟搴撲綅
- /// </summary>
- public string WarehouseLocation { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- public string Supplier { get; set; }
-
- /// <summary>
- /// 杞藉叿缂栫爜
- /// </summary>
- public string CarrierCode { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 鍑哄簱绫诲瀷
- /// </summary>
- public int Type { get; set; }
-
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- public string ExpirationDate { get; set; }
-
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string ProductionDate { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏍囩
- /// </summary>
- public string MaterialBarCode { get; set; }
-
- /// <summary>
- /// 瑁佸垏鍨嬪彿
- /// </summary>
- public string CutedType { get; set; }
-
- /// <summary>
- /// PP瀹藉害
- /// </summary>
- public float PPWidth { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesProductOutBound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesProductOutBound.cs"
deleted file mode 100644
index 7e40848..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesProductOutBound.cs"
+++ /dev/null
@@ -1,61 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// 搴撳瓨鏉垮嚭搴�
- /// </summary>
- public class MesProductOutBound
- {
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskNo { get; set; }
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string ProductCode { get; set; }
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- public string ProductVersion { get; set; }
- /// <summary>
- /// 鍛ㄦ湡
- /// </summary>
- public string DateCode { get; set; }
- /// <summary>
- /// 閿�鍞鍗�
- /// </summary>
- public string SaleOrder { get; set; }
- /// <summary>
- /// 浠撳簱淇℃伅
- /// </summary>
- public List<MesInventoryInfo> InventoryInfo { get; set; }
- }
- /// <summary>
- /// 浠撳簱淇℃伅
- /// </summary>
- public class MesInventoryInfo
- {
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string Warhouseno { get; set; }
- /// <summary>
- /// 鍐呭寘鍙�
- /// </summary>
- public string InternalPackageNumber { get; set; }
- /// <summary>
- /// SET鏁伴噺
- /// </summary>
- public int SetCount { get; set; }
- /// <summary>
- /// 鍚堟牸PCS鏁伴噺
- /// </summary>
- public int EligiblePcsCount { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesShipmentOrderSync.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesShipmentOrderSync.cs"
deleted file mode 100644
index 13541e2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesShipmentOrderSync.cs"
+++ /dev/null
@@ -1,95 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// WMS鍚屾鎴愬搧鑷矼ES
- /// </summary>
- public class MesShipmentOrderSync
- {
- /// <summary>
- /// 鍑鸿揣鍗曞彿
- /// </summary>
- public string ShipmentOrder { get; set; }
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- public string Customer { get; set; }
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- public string FactoryCode { get; set; }
- /// <summary>
- /// 鍑鸿揣鍦板悕绉�
- /// </summary>
- public string ShipName { get; set; }
- /// <summary>
- /// 鍑鸿揣鍦板潃
- /// </summary>
- public string ShippingAddress { get; set; }
- /// <summary>
- /// 璁″垝鍑鸿揣鏃堕棿
- /// </summary>
- public string PlantShipDate { get; set; }
- /// <summary>
- /// 璇︽儏
- /// </summary>
- public List<MesShipOrderDetail> OrderDetails { get; set; }
- }
- /// <summary>
- /// 璇︽儏
- /// </summary>
- public class MesShipOrderDetail
- {
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string ProductCode { get; set; }
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- public string ProductVersion { get; set; }
- /// <summary>
- /// 鍑鸿揣鏁伴噺
- /// </summary>
- public float Qty { get; set; }
- /// <summary>
- /// 鍛ㄦ湡
- /// </summary>
- public string DateCode { get; set; }
- /// <summary>
- /// 閿�鍞鍗�
- /// </summary>
- public string SaleOrder { get; set; }
- /// <summary>
- /// 搴忓彿
- /// </summary>
- public int Sequence { get; set; }
- /// <summary>
- /// 宸ヤ綔涓績
- /// </summary>
- public string WorkCenter { get; set; }
- /// <summary>
- /// 鑳舵淇℃伅
- /// </summary>
- public List<PlasticBox> PlasticBox { get; set; }
- }
- /// <summary>
- /// 鑳舵淇℃伅
- /// </summary>
- public class PlasticBox
- {
- /// <summary>
- /// 鑳舵鍙�
- /// </summary>
- public string PlasticBoxNumber { get; set; }
- /// <summary>
- /// 鍐呭寘淇℃伅
- /// </summary>
- public List<string> Insourcings { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesSolderModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesSolderModel.cs"
deleted file mode 100644
index 6ba2f15..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/MesSolderModel.cs"
+++ /dev/null
@@ -1,39 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES闃荤剨鑾峰彇鎵规鐗╂枡淇℃伅
- /// </summary>
- public class MesSolderModel
- {
- /// <summary>
- /// 鏂欏彿
- /// </summary>
- public string Product { get; set; }
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- public string ProductVersion { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public float Qty { get; set; }
- /// <summary>
- /// 鍛ㄦ湡
- /// </summary>
- public string DateCode { get; set; }
- /// <summary>
- /// 鎵规
- /// </summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 鏄惁婊ot
- /// </summary>
- public string IsFullNumber { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/PPSubsectionModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/PPSubsectionModel.cs"
deleted file mode 100644
index e4fe6e9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/PPSubsectionModel.cs"
+++ /dev/null
@@ -1,194 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// PP澶у嵎鍑哄簱
- /// </summary>
- public class PPSubsectionOutModel
- {
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskNo { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
- /// <summary>
- /// 闇�姹傛暟閲�
- /// </summary>
- public float RequiredQuantity { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
- /// <summary>
- /// 绾胯竟浠撳湴鍧�鐮�
- /// </summary>
- public string TargetAddressCode { get; set; }
- /// <summary>
- /// 瑁佸垏瀹�
- /// </summary>
- public float Width { get; set; }
- /// <summary>
- /// 杞藉叿鍒楄〃
- /// </summary>
- public List<CarrierInfo> Carriers { get; set; }
- }
- /// <summary>
- /// 杞藉叿鍒楄〃鏄庣粏
- /// </summary>
- [ModelValidate]
- public class CarrierInfo
- {
- /// <summary>
- /// 搴撳尯
- /// </summary>
- public string Warehouse { get; set; }
- /// <summary>
- /// 杞藉叿鍙�
- /// </summary>
- public string CarrierCode { get; set; }
- }
- /// <summary>
- /// pp灏忓嵎鍑哄簱
- /// </summary>
- public class PPCutOutModle
- {
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskNo { get; set; }
- /// <summary>
- /// 鐗╂枡璇︽儏
- /// </summary>
- public List<MaterialDetail> MaterialDetails { get; set; }
- }
- /// <summary>
- /// 鐗╂枡璇︽儏鏄庣粏
- /// </summary>
- [ModelValidate]
- public class MaterialDetail
- {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
- /// <summary>
- /// 闇�姹傛暟閲�
- /// </summary>
- public float RequiredQuantity { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
- /// <summary>
- /// 灞傚埆
- /// </summary>
- public string LayerCode { get; set; }
- /// <summary>
- /// 搴忓垪
- /// </summary>
- public int Sequence { get; set; }
- /// <summary>
- /// 绾胯竟浠撳湴鍧�
- /// </summary>
- public string TargetAddressCode { get; set; }
- /// <summary>
- /// 瑁佸垏瀹�
- /// </summary>
- public float Width { get; set; }
- }
- /// <summary>
- /// PP鍏ュ簱
- /// </summary>
- public class PPBackModel
- {
- /// <summary>
- /// 婧愬湴鍧�鐮�
- /// </summary>
- public string SourceAddressCode { get; set; }
- /// <summary>
- ///杞藉叿鍙�
- /// </summary>
- public string CarrierCode { get; set; }
- /// <summary>
- /// 鎵规淇℃伅
- /// </summary>
- public List<MaterialLotInfo> MaterialLotInfo { get; set; }
-
- }
- /// <summary>
- /// 鎵规淇℃伅鏄庣粏
- /// </summary>
- [ModelValidate]
- public class MaterialLotInfo
- {
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- /// 閫�搴撴暟閲�
- /// </summary>
- public float Quantity { get; set; }
- /// <summary>
- /// 瑁佸垏鍚庡搴�
- /// </summary>
- public float CutedWidth { get; set; }
- /// <summary>
- /// 鍘熺墿鏂欐壒娆″彿
- /// </summary>
- public string MaterialLotOld { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string ProductionDate { get; set; }
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- public string ExpirationDate { get; set; }
- }
- /// <summary>
- /// PP搴撳瓨鏌ヨ
- /// </summary>
- public class QueryPpByWidthModel
- {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- /// 瑁佸垏鍚庡搴�
- /// </summary>
- public float CutedWidth { get; set; }
- /// <summary>
- /// 搴撳尯绫诲瀷
- /// </summary>
- public int WarehouseType { get; set; }
- }
-
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/RworkTaskModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/RworkTaskModel.cs"
deleted file mode 100644
index 813b7d3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/RworkTaskModel.cs"
+++ /dev/null
@@ -1,64 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// 杩斿伐鎻愬簱
- /// </summary>
- [ModelValidate]
- public class RworkTaskModel
- {
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [PropertyValidate("浠诲姟鍗曞彿", NotNullAndEmpty = true)]
- public string TaskNo { get; set; }
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [PropertyValidate("浜у搧缂栫爜", NotNullAndEmpty = true)]
- public string ProductCode { get; set; }
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [PropertyValidate("浜у搧鍚嶇О", NotNullAndEmpty = true)]
- public string ProductName { get; set; }
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- [PropertyValidate("浜у搧鐗堟湰", NotNullAndEmpty = true)]
- public string ProductVersion { get; set; }
- /// <summary>
- /// 鍛ㄦ湡
- /// </summary>
- [PropertyValidate("鍛ㄦ湡", NotNullAndEmpty = true)]
- public string DateCode { get; set; }
- /// <summary>
- /// 闇�姹傛暟閲�
- /// </summary>
- [PropertyValidate("闇�姹傛暟閲�", NotNullAndEmpty = true)]
- public float RequiredQuantity { get; set; }
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- public string FactoryCode { get; set; }
- /// <summary>
- /// 閿�鍞鍗�
- /// </summary>
- [PropertyValidate("閿�鍞鍗�", NotNullAndEmpty = true)]
- public string SaleOrder { get; set; }
- /// <summary>
- /// 搴撳瓨绫诲瀷
- /// 1:瀹㈤��<br/>
- /// 2:搴撳瓨涓嶈壇<br/>
- /// 3:浣欐暟鎻愪粨<br/>
- /// </summary>
- [PropertyValidate("搴撳瓨绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2,3 })]
- public int InventoryType { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/SubstrateModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/SubstrateModel.cs"
deleted file mode 100644
index b36a00d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/SubstrateModel.cs"
+++ /dev/null
@@ -1,90 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// 鍩烘澘鍑哄簱
- /// </summary>
- public class SubstrateOutModel
- {
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 闇�姹傛暟閲�
- /// </summary>
- public float RequiredQuantity { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
-
- /// <summary>
- /// 绾夸綋
- /// </summary>
- public string Line { get; set; }
- }
-
- /// <summary>
- /// 鍩烘澘浣欐枡閫�搴�
- /// </summary>
- public class SubstrateBackModel
- {
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍒嗙被
- /// </summary>
- public string MaterialCategory { get; set; }
-
- /// <summary>
- /// 閫�搴撴暟閲�
- /// </summary>
- public float Quantity { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
-
- /// <summary>
- /// 杞藉叿缂栫爜
- /// </summary>
- public string CarrierCode { get; set; }
-
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string ProductionDate { get; set; }
-
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- public string ExpirationDate { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/TestToolModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/TestToolModel.cs"
deleted file mode 100644
index 9fbec5f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/MES/TestToolModel.cs"
+++ /dev/null
@@ -1,79 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// 娴嬭瘯鏋跺嚭浠撴ā鍨�
- /// </summary>
- [ModelValidate]
- public class TestToolOutModel
- {
- /// <summary>
- /// 娴嬭瘯鏋舵壒娆″彿
- /// </summary>
- [PropertyValidate("娴嬭瘯鏋舵壒娆″彿", NotNullAndEmpty = true)]
- public string ToolCode { get; set; }
- /// <summary>
- /// 鐩爣鍦板潃鐮�
- /// </summary>
- [PropertyValidate("鐩爣鍦板潃鐮�", NotNullAndEmpty = true)]
- public string TargetAddressCode { get; set; }
- }
-
- /// <summary>
- /// 娴嬭瘯鏋舵姤搴熸ā鍨�
- /// </summary>
- [ModelValidate]
- public class TestToolScrap
- {
- /// <summary>
- /// 娴嬭瘯鏋舵壒娆″彿
- /// </summary>
- [PropertyValidate("娴嬭瘯鏋舵壒娆″彿", NotNullAndEmpty = true)]
- public List<string> ToolCodes { get; set; }
- }
-
- /// <summary>
- /// 娴嬭瘯鏋堕��搴�
- /// </summary>
- [ModelValidate]
- public class TestToolBackModel
- {
- /// <summary>
- /// 婧愪綅缃�
- /// </summary>
- [PropertyValidate("婧愪綅缃�", NotNullAndEmpty = true)]
- public string SourceAddressCode { get; set; }
-
- /// <summary>
- /// 娴嬭瘯鏋舵壒娆″彿
- /// </summary>
- [PropertyValidate("娴嬭瘯鏋舵壒娆″彿", NotNullAndEmpty = true)]
- public string TestToolCode { get; set; }
- }
-
- /// <summary>
- ///娴嬭瘯鏋跺悓姝�
- /// </summary>
- public class TestToolSynInfo
- {
- /// <summary>
- /// 娴嬭瘯鏋舵壒娆″彿
- /// </summary>
- public string ToolCode { get; set; }
- ///// <summary>
- ///// 娴嬭瘯鏋剁墿鏂欏悕绉�
- ///// </summary>
- public string MaterialName { get; set; }
- /// <summary>
- /// 鍒濆瀵垮懡
- /// </summary>
- public int Life { get; set; }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutProInfoDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutProInfoDTO.cs"
deleted file mode 100644
index 3d0c28d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutProInfoDTO.cs"
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Outbound
-{
- /// <summary>
- /// 鎵爜鍑哄簱淇℃伅
- /// </summary>
- public class OutProInfoDTO
- {
- /// <summary>
- /// 浜у搧缂栧彿
- /// </summary>
- public string ProductCode { get; set; }
- /// <summary>
- /// 浜у搧缂栧彿鍑哄簱鏁伴噺
- /// </summary>
- public int OutQtys { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderAddDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderAddDTO.cs"
deleted file mode 100644
index 7d949ad..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderAddDTO.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.Attributes;
-
-namespace WIDESEA_DTO.Outbound
-{
- [ModelValidate]
- public class OutboundOrderAddDTO
- {
- /// <summary>
- /// 涓婃父鍗曟嵁缂栧彿
- /// </summary>
- public string UpperOrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [PropertyValidate("鍗曟嵁绫诲瀷", NotNullAndEmpty = true)]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
-
- [PropertyValidate("鍗曟嵁鏄庣粏淇℃伅", NotNullAndEmpty = true)]
- public List<OutboundOrderDetailAddDTO> Details { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderDetailAddDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderDetailAddDTO.cs"
deleted file mode 100644
index e5bbbf8..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderDetailAddDTO.cs"
+++ /dev/null
@@ -1,39 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Outbound
-{
- [ModelValidate]
- public class OutboundOrderDetailAddDTO
- {
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterielName { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string BatchNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏁伴噺
- /// </summary>
- [PropertyValidate("鍗曟嵁鏁伴噺", NotNullAndEmpty = true, MinValue = 0, IsContainMinValue = false)]
- public decimal OrderQuantity { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderGetDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderGetDTO.cs"
deleted file mode 100644
index e029706..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Outbound/OutboundOrderGetDTO.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Outbound
-{
- public class OutboundOrderGetDTO
- {
- public string OrderNo { get; set; }
- public int pageNo { get; set; }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/StockSelectViewDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/StockSelectViewDTO.cs"
deleted file mode 100644
index d90115b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/StockSelectViewDTO.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Stock
-{
- public class StockSelectViewDTO
- {
-
- 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; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/StockViewDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/StockViewDTO.cs"
deleted file mode 100644
index 2a12389..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/Stock/StockViewDTO.cs"
+++ /dev/null
@@ -1,167 +0,0 @@
-锘�
-using Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_DTO.Stock
-{
- /// <summary>
- /// 搴撳瓨瑙嗗浘
- /// </summary>
- public class StockViewDTO
- {
- /// <summary>
- /// 浠撳簱ID
- /// </summary>
- [ExporterHeader(DisplayName = "浠撳簱ID")]
- public int WarehouseId { get; set; }
- /// <summary>
- /// 璐т綅缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
- public string LocationCode { get; set; }
-
- /// <summary>
- /// 璐т綅鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅鍚嶇О")]
- public string LocationName { get; set; }
-
- /// <summary>
- /// 璐т綅鍒�
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅鍒�")]
- public int Column { get; set; }
-
- /// <summary>
- /// 璐т綅琛�
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅琛�")]
- public int Row { get; set; }
-
- /// <summary>
- /// 璐т綅灞�
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅灞�")]
- public int Layer { get; set; }
-
- /// <summary>
- /// 璐т綅娣卞害
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅娣卞害")]
- public int Depth { get; set; }
-
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅鐘舵��")]
- public int LocationStatus { get; set; }
-
- /// <summary>
- /// 璐т綅绫诲瀷
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅绫诲瀷")]
- public int LocationType { get; set; }
-
- /// <summary>
- /// 宸烽亾缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "宸烽亾缂栧彿")]
- public string RoadwayNo { get; set; }
-
- /// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public int EnalbeStatus { get; set; }
-
- /// <summary>
- /// 搴撳瓨涓婚敭
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public int StockId { get; set; }
-
- /// <summary>
- /// 鎵樼洏鍙�
- /// </summary>
- [ExporterHeader(DisplayName = "鎵樼洏鍙�")]
- public string PalletCode { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public bool IsFull { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡缂栫爜")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡瑙勬牸")]
- public string MaterielSpec { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵瑰彿
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡鎵瑰彿")]
- public string BatchNo { get; set; }
- /// <summary>
- /// 搴撳瓨鏁伴噺
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨鏁伴噺")]
- public string StockCounts { get; set; }
-
- /// <summary>
- /// 搴撳瓨鐘舵��
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public int StockStatus { get; set; }
-
- /// <summary>
- /// 搴撳瓨澶囨敞
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public string StockRemark { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [ExporterHeader(DisplayName = "鍒涘缓浜�")]
- public string Creater { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
- public DateTime CreateDate { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- [ExporterHeader(DisplayName = "淇敼浜�")]
- public string Modifier { get; set; }
-
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- [ExporterHeader(DisplayName = "淇敼鏃堕棿")]
- public DateTime? ModifyDate { get; set; }
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj"
index 502ce7c..60e8f67 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj"
@@ -11,4 +11,8 @@
<ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Outbound\" />
+ </ItemGroup>
+
</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs"
index f279c45..e787b9f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/ERPService/InvokeERPService.cs"
@@ -28,279 +28,5 @@
{
ContractResolver = new CamelCasePropertyNamesContractResolver()
};
- /// <summary>
- /// ERP鏀惰揣鍗曟帴鍙ｈ皟鐢�
- /// </summary>
- /// <param name="receiveModel"></param>
- /// <returns></returns>
- public string InvokeMatReceiveApi(ERPReceiveModel receiveModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPReceiveModel> model = new ERPBaseModel<ERPReceiveModel>()
- {
- Data = receiveModel,
- Desc = "WMS鏀惰揣鍗曟帹閫�",
- Type = "toTCWMSReceive",
- SecurityCode = "TeChuang"
- };
-
- string request = JsonConvert.SerializeObject(model, settings);
-
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
-
- /// <summary>
- /// ERP鐗╂枡IQC妫�楠屽崟鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- public string InvokeCheckOrderApi(ERPCheckModel checkModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPCheckModel> model = new ERPBaseModel<ERPCheckModel>()
- {
- Data = checkModel,
- Desc = "鐗╂枡IQC妫�楠屽崟",
- Type = "toTCWMSIQCTest",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
-
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
-
- /// <summary>
- /// ERP鐗╂枡鍏ュ簱鍗曟帴鍙ｈ皟鐢�
- /// </summary>
- /// <param name="inboundModel"></param>
- /// <returns></returns>
- public string InvokeInboundOrderApi(ERPInboundModel inboundModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPInboundModel> model = new ERPBaseModel<ERPInboundModel>()
- {
- Data = inboundModel,
- Desc = "鐗╂枡鍏ュ簱鍗�",
- Type = "toTCWMSMaterialWarehousing",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP棰嗘枡閫氱煡鍗曞嚭搴�
- /// </summary>
- public string InvokeOutStandardsApi(ERPIssueModel issueModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPIssueModel> model = new ERPBaseModel<ERPIssueModel>()
- {
- Data = issueModel,
- Desc = "棰嗘枡鍑哄簱閫氱煡鍗�",
- Type = "toStandardPickList",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings).Replace("issitem", "Issitem");
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP閫�鏂欎笂鎶ユ帴鍙ｈ皟鐢�
- /// </summary>
- public string InvokeReturnApi(ERPReturnModel returnModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPReturnModel> model = new ERPBaseModel<ERPReturnModel>()
- {
- Data = returnModel,
- Desc = "鏉愭枡閫�搴�",
- Type = "importMaterialsIssueNoteWMS",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings).Replace("issitem", "Issitem");
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鐩樿耽/浜忎笂鎶ユ帴鍙ｈ皟鐢�
- /// </summary>
- public string InvokeTakeStockApi(ERPTakeStockModel takeModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPTakeStockModel> model = new ERPBaseModel<ERPTakeStockModel>()
- {
- Data = takeModel,
- Desc = "鏉愭枡鐩樼偣",
- Type = "toTCWMSMaterialCounting",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧鍑哄簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- public string InvokeProOutApi(ERPProOutOrderModel outOrderModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProOutOrderModel> model = new ERPBaseModel<ERPProOutOrderModel>()
- {
- Data = outOrderModel,
- Desc = "鍑哄簱鎴愬搧閫氱煡",
- Type = "toOrderAssignment",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧璁㈠崟瀹㈡埛鏌ヨ鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="saleOrderNo"></param>
- /// <returns></returns>
- public string InvokeProSaleCustomer(string saleOrderNo)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpSaleCustomApi.ToString());
- object saleObj = new { soNumber=saleOrderNo };
- string request = JsonConvert.SerializeObject(saleObj, settings);
- Dictionary<string,string> requestHeader =new Dictionary<string, string>
- {
- { "AccessToken", "TCKJF60B03C07E8E41B0B3CF759B7B01AB81HATC"},
- };
- string response = HttpHelper.Post(apiInfo.ApiAddress, request,headers:requestHeader);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧璁㈠崟鍑哄簱搴撳瓨鏌ヨ
- /// </summary>
- /// <returns></returns>
- public string InvokeOutProErpSync(string outProOrderNo)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpOutProErpSyncApi.ToString());
- object outNoObj = new { shippingNumber = outProOrderNo };
- string request = JsonConvert.SerializeObject(outNoObj, settings);
- Dictionary<string, string> requestHeader = new Dictionary<string, string>
- {
- { "AccessToken", "TCKJF60B03C07E8E41B0B3CF759B7B01AB81HATC"},
- };
- string response = HttpHelper.Post(apiInfo.ApiAddress, request, headers: requestHeader);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ
- /// </summary>
- /// <returns></returns>
- public string InvokeProInErpStatic(string partNum,string partNumWithRev)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeProInErpStatic.ToString());
- object inObj = new { partNum, partNumWithRev };
- string request = JsonConvert.SerializeObject(inObj, settings);
- Dictionary<string, string> requestHeader = new Dictionary<string, string>
- {
- { "AccessToken", "TCKJF60B03C07E8E41B0B3CF759B7B01AB81HATC"},
- };
- string response = HttpHelper.Post(apiInfo.ApiAddress, request, headers: requestHeader);
- return response;
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- public string InvokeProInApi(ERPProInboundModel inboundModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProInboundModel> model = new ERPBaseModel<ERPProInboundModel>()
- {
- Data = inboundModel,
- Desc = "鎴愬搧鍏ュ簱",
- Type = "toWOStockForm",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// 鎴愬搧浠撴鎶ュ簾鍑哄簱鎺ㄩ�丒RP
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- public string InvokeProCheckApi(ERPProductCheckModel checkModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProductCheckModel> model = new ERPBaseModel<ERPProductCheckModel>()
- {
- Data = checkModel,
- Desc = "鎴愬搧妫�楠屽崟",
- Type = "toFGIIqcChecked",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// 鎴愬搧瓒呭懆鏈熸姤搴熸帹閫丒RP
- /// </summary>
- /// <param name="sheetModel"></param>
- /// <returns></returns>
- public string InvokeProScrapSheetApi(ERPScrapSheetModel sheetModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPScrapSheetModel> model = new ERPBaseModel<ERPScrapSheetModel>()
- {
- Data = sheetModel,
- Desc = "鎴愬搧鎶ュ簾鍗�",
- Type = "toFGIScrapSheet",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// 鎴愬搧鐩樼偣鐩樿耽/鐩樹簭
- /// </summary>
- /// <param name="stockCheckModel"></param>
- /// <returns></returns>
- public string InvokeProStockCheckApi(ERPProStockCheckModel stockCheckModel)
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- ERPBaseModel<ERPProStockCheckModel> model = new ERPBaseModel<ERPProStockCheckModel>()
- {
- Data = stockCheckModel,
- Desc = "鎴愬搧鐩樼偣鍗�",
- Type = "toStockCheck",
- SecurityCode = "TeChuang"
- };
- string request = JsonConvert.SerializeObject(model, settings);
- string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- return response;
- }
- /// <summary>
- /// ERP鐗╂枡鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="outboundModel"></param>
- /// <returns></returns>
- #region 寮冪敤
- //public string InvokeOutboundOrderApi(ERPOutboundModel outboundModel)
- //{
- // Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
- // ERPBaseModel<ERPOutboundModel> model = new ERPBaseModel<ERPOutboundModel>()
- // {
- // Data = outboundModel,
- // Desc = "鏉愭枡鍑哄簱",
- // Type = "toBomMaterialOutTC",
- // SecurityCode = "TeChuang"
- // };
- // string request = JsonConvert.SerializeObject(model, settings);
- // string response = HttpHelper.Post(apiInfo.ApiAddress, request);
- // return response;
- //}
- #endregion
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/IERPService/IInvokeERPService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/IERPService/IInvokeERPService.cs"
index d2c6d98..0a64657 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/IERPService/IInvokeERPService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/IERPService/IInvokeERPService.cs"
@@ -13,83 +13,6 @@
/// </summary>
public interface IInvokeERPService : IDependency
{
- /// <summary>
- /// ERP鏀惰揣鍗曟帴鍙ｈ皟鐢�
- /// </summary>
- /// <param name="receiveModel"></param>
- /// <returns></returns>
- string InvokeMatReceiveApi(ERPReceiveModel receiveModel);
-
- /// <summary>
- /// ERP鐗╂枡IQC妫�楠屽崟鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- string InvokeCheckOrderApi(ERPCheckModel checkModel);
-
- /// <summary>
- /// ERP鐗╂枡鍏ュ簱鍗曟帴鍙ｈ皟鐢�
- /// </summary>
- /// <param name="inboundModel"></param>
- /// <returns></returns>
- string InvokeInboundOrderApi(ERPInboundModel inboundModel);
- /// <summary>
- /// ERP鐗╂枡鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- string InvokeOutStandardsApi(ERPIssueModel issueModel);
- /// <summary>
- /// ERP閫�鏂欎笂鎶ユ帴鍙ｈ皟鐢�
- /// </summary>
- string InvokeReturnApi(ERPReturnModel returnModel);
- /// <summary>
- /// ERP鐩樿耽/浜忎笂鎶ユ帴鍙ｈ皟鐢�
- /// </summary>
- string InvokeTakeStockApi(ERPTakeStockModel takeModel);
- /// <summary>
- /// ERP鎴愬搧鍑哄簱瀹屾垚涓婃姤
- /// </summary>
- /// <param name="outOrderModel"></param>
- /// <returns></returns>
- string InvokeProOutApi(ERPProOutOrderModel outOrderModel);
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱瀹屾垚涓婃姤
- /// </summary>
- /// <param name="inboundModel"></param>
- /// <returns></returns>
- string InvokeProInApi(ERPProInboundModel inboundModel);
- /// <summary>
- /// 鎴愬搧浠撴鎶ュ簾鍑哄簱鎺ㄩ�丒RP
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- string InvokeProCheckApi(ERPProductCheckModel checkModel);
- /// <summary>
- /// 鎴愬搧瓒呭懆鏈熸姤搴熸帹閫丒Rp
- /// </summary>
- /// <param name="sheetModel"></param>
- /// <returns></returns>
- string InvokeProScrapSheetApi(ERPScrapSheetModel sheetModel);
- /// <summary>
- /// 鎴愬搧鐩樼偣鐩樿耽/鐩樹簭
- /// </summary>
- /// <param name="stockCheckModel"></param>
- /// <returns></returns>
- string InvokeProStockCheckApi(ERPProStockCheckModel stockCheckModel);
- /// <summary>
- /// ERP鎴愬搧璁㈠崟瀹㈡埛鏌ヨ鎺ュ彛璋冪敤
- /// </summary>
- /// <param name="saleOrderNo"></param>
- /// <returns></returns>
- string InvokeProSaleCustomer(string saleOrderNo);
- /// <summary>
- /// ERP鎴愬搧璁㈠崟鍑哄簱搴撳瓨鏌ヨ
- /// </summary>
- /// <returns></returns>
- string InvokeOutProErpSync(string outProOrderNo);
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ
- /// </summary>
- /// <returns></returns>
- string InvokeProInErpStatic(string partNum, string partNumWithRev);
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPCheckModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPCheckModel.cs"
deleted file mode 100644
index 017bb4b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPCheckModel.cs"
+++ /dev/null
@@ -1,134 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 璐ㄦ鍗曞洖浼燛RP
- /// </summary>
- public class ERPCheckModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
-
- /// <summary>
- /// 涓婚敭鍊�
- /// </summary>
- public string UniqueTag { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 鍏徃浠ｅ彿
- /// </summary>
- public string CompanyId { get; set; } = "HATC";
-
- /// <summary>
- /// 宸ュ巶浠ｅ彿
- /// </summary>
- public string PlantsId { get; set; } = "HA02";
-
- /// <summary>
- /// 鏀惰揣鍗曞彿
- /// </summary>
- public string ReceiptCode { get; set; }
-
- /// <summary>
- /// 鏀惰揣鍗曟槑缁嗚鍙�
- /// </summary>
- public string SerNo { get; set; }
-
- /// <summary>
- /// 鏀惰揣鍗曠墿鏂欐槑缁嗕唬鐮�
- /// </summary>
- public string MaterialsCode { get; set; }
-
- /// <summary>
- /// 鏀惰揣鏃ユ湡
- /// </summary>
- public string ReceiveDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Note { get; set; }
-
- /// <summary>
- /// 鍚堟牸鏁伴噺
- /// </summary>
- public string QtyQualified { get; set; }
-
- /// <summary>
- /// 鐗归噰鏁伴噺
- /// </summary>
- public string QtyDefected { get; set; }
-
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- public string QtyReturn { get; set; }
-
- /// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
- public string QtyScrapped { get; set; }
-
- /// <summary>
- /// 妫�楠屾�绘暟锛堟敹璐ф�绘暟锛�
- /// </summary>
- public string QtyInspected { get; set; }
-
- /// <summary>
- /// 妫�楠屽垽鏂粨鏋�
- /// </summary>
- public string Result { get; set; }
-
- /// <summary>
- /// 鐗归噰璇存槑
- /// </summary>
- public string DefectedNote { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜轰唬鍙�
- /// </summary>
- public string CreatorCode { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- public string TestDate { get; set; }
-
- public List<ERPCheckResult> Details { get; set; }
- }
-
- public class ERPCheckResult
- {
- /// <summary>
- /// 缂洪櫡浠ｇ爜
- /// </summary>
- public string DefectCode { get; set; }
-
- /// <summary>
- /// 缁撴灉
- /// </summary>
- public string Result { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public string Quantity { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Note { set; get; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPInboundModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPInboundModel.cs"
deleted file mode 100644
index 7f324d1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPInboundModel.cs"
+++ /dev/null
@@ -1,124 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鍏ュ簱鍗曞洖浼燛RP
- /// </summary>
- public class ERPInboundModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
-
- /// <summary>
- /// 涓婚敭鍊�
- /// </summary>
- public string UniqueTag { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 鍏ュ簱绫诲瀷
- /// </summary>
- public string Type { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗕唬鍙�
- /// </summary>
- public string SuppliersId { get; set; }
-
- /// <summary>
- /// 鍏徃浠ｅ彿
- /// </summary>
- public string CompanyId { get; set; } = "HATC";
-
- /// <summary>
- /// 宸ュ巶浠ｅ彿
- /// </summary>
- public string PlantsId { get; set; } = "HA02";
-
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- public string StockDate { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｅ彿
- /// </summary>
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜轰唬鍙�
- /// </summary>
- public string CreatorCode { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- public string EntDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Note { get; set; }
-
- public List<ERPInboundDetailModel> Details { get; set; }
- }
-
- public class ERPInboundDetailModel
- {
- /// <summary>
- /// 鎺ユ敹鍗曞彿
- /// </summary>
- public string ReceiptCode { get; set; }
-
- /// <summary>
- /// 鎺ユ敹鍗曟槑缁嗚鍙�
- /// </summary>
- public string ReceiptSerNo { get; set; }
-
- /// <summary>
- /// 鎺ユ敹鍗曟槑缁嗙墿鏂欎唬鐮�
- /// </summary>
- public string MaterialsCode { get; set; }
-
- /// <summary>
- /// 鍌ㄥ尯浠ｅ彿(浠撳簱浠ｅ彿)
- /// </summary>
- public string LocationCode { get; set; }
-
- /// <summary>
- /// 璐т綅
- /// </summary>
- public string Rack { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public string Quantity { get; set; }
-
- /// <summary>
- /// 娴峰叧鎺ユ敹鏁伴噺
- /// </summary>
- public string QtyCustoms { get; set; }
-
- /// <summary>
- /// 鍒堕�犳棩鏈�
- /// </summary>
- public string MfgDate { get; set; }
-
- /// <summary>
- /// 杩囨湡鏃ユ湡
- /// </summary>
- public string ExpiryDate { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPIssueModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPIssueModel.cs"
deleted file mode 100644
index 4470043..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPIssueModel.cs"
+++ /dev/null
@@ -1,127 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 棰嗘枡鍑哄簱閫氱煡鍗曞洖浼燛RP
- /// </summary>
- public class ERPIssueModel
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- public string UniqueTag { get; set; }
-
- /// <summary>
- /// 鍙戞枡鍗曞彿
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬浠ｇ爜
- /// </summary>
- public string Deptno { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- public string Deptname { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Docremark { get; set; }
-
- /// <summary>
- /// 鏃ユ湡
- /// </summary>
- public string Createtime { get; set; }
-
- /// <summary>
- /// 浜哄憳
- /// </summary>
- public string Createuser { get; set; }
-
- /// <summary>
- /// 鐮斿彂
- /// </summary>
- public int IsDev { get; set; } = 0;
-
- /// <summary>
- /// 璇︽儏
- /// </summary>
- public List<ERPIssueItemModel> Issitem { get; set; }
- }
-
- /// <summary>
- /// 棰嗘枡鍑哄簱閫氱煡鍗曡鎯�
- /// </summary>
- public class ERPIssueItemModel
- {
- /// <summary>
- /// 棰嗘枡鍗曞彿
- /// </summary>
- public string Pickcode { get; set; }
-
- /// <summary>
- /// 鍙戞斁璇︽儏
- /// </summary>
- public List<ERPPickModel> PickList { get; set; }
- }
-
- /// <summary>
- /// 鍙戞斁璇︽儏
- /// </summary>
- public class ERPPickModel
- {
- /// <summary>
- /// 鍙戞枡鏄庣粏琛屽彿
- /// </summary>
- public int Rowindex { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string Material { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public string Qty { get; set; }
-
- /// <summary>
- /// 搴撳瓨璇︽儏
- /// </summary>
- public List<ERPPickItemModel> Dataitem { get; set; }
- }
-
- /// <summary>
- /// 搴撳瓨璇︽儏
- /// </summary>
- public class ERPPickItemModel
- {
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string Lotno { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public string Qty { get; set; }
-
- /// <summary>
- /// 鍌ㄤ綅 浠撳簱缂栧彿
- /// </summary>
- public string Location { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPMaintainIssueModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPMaintainIssueModel.cs"
deleted file mode 100644
index 8a62dee..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPMaintainIssueModel.cs"
+++ /dev/null
@@ -1,92 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 缁翠慨鍙戞枡鍑哄簱鍗�
- /// </summary>
- public class ERPMaintainIssueModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
-
- /// <summary>
- /// 涓诲仴鍊�
- /// </summary>
- public int UniqueTag { get; set; }
-
- /// <summary>
- /// 鍙戞枡鍗曞彿
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 鍙戞枡鏃堕棿
- /// </summary>
- public string Createtime { get; set; }
-
- /// <summary>
- /// 鍙戞枡浜哄憳
- /// </summary>
- public string Createuser { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<MaintainIssuelist> Itemlist { get; set; }
- }
- public class MaintainIssuelist
- {
- /// <summary>
- /// 鍙戞枡鏄庣粏琛屽彿
- /// </summary>
- public int RowNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string Material { get; set; }
- /// <summary>
- /// 缁翠慨鍗曞彿
- /// </summary>
- public string Pickno { get; set; }
-
- /// <summary>
- /// 鍙戞枡鏁伴噺
- /// </summary>
- public string Issueqty { get; set; }
-
- /// <summary>
- ///
- /// </summary>
- public List<ERPBatchlist> Batchlist { get; set; }
- }
- public class ERPBatchlist {
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string Lotno { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public string Qty { get; set; }
-
-
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPMaterialSaleReturnModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPMaterialSaleReturnModel.cs"
deleted file mode 100644
index 6ae3e74..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPMaterialSaleReturnModel.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鐗╂枡閿�鍞��璐у叆搴�
- /// </summary>
- public class ERPMaterialSaleReturnModel
- {
- /// <summary>
- /// 绫诲瀷
- /// </summary>
- public string Way { get; set; }
-
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- public string Code { get; set; }
-
- }
-
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPOutboundModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPOutboundModel.cs"
deleted file mode 100644
index 382130a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPOutboundModel.cs"
+++ /dev/null
@@ -1,85 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鐗╂枡鍙戜粨鍑哄簱鍥炰紶ERP
- /// </summary>
- public class ERPOutboundModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
- /// <summary>
- /// 涓婚敭鍊�
- /// </summary>
- public string UniqueTag { get; set; }
- /// <summary>
- /// 鍙戞枡鍗曞彿
- /// </summary>
- public string Code { get; set; }
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 鍗曟嵁澶囨敞
- /// </summary>
- public string Docremark { get; set; }
- /// <summary>
- /// 鍙戞枡閮ㄩ棬缂栫爜
- /// </summary
- public string Deptno { get; set; }
- /// <summary>
- /// 鍙戞枡閮ㄩ棬鍚嶇О
- /// </summary
- public string DeptName { get; set; }
- /// <summary>
- /// 鍙戞枡鏃堕棿
- /// </summary
- public string Createtime { get; set; }
- /// <summary>
- /// 鍙戞枡浜哄憳
- /// </summary
- public string Createuser { get; set; }
- /// <summary>
- ///
- /// </summary
- public List<ERPOutPick> Picklist { get; set; }
- }
- public class ERPOutPick
- {
- /// <summary>
- /// 鍙戞枡琛屽彿
- /// </summary>
- public string Rowindex { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string Material { get; set; }
- /// <summary>
- /// 鎬绘暟閲�
- /// </summary>
- public int Qty { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<ERPOutPickDetail> Dataitem { get; set; }
- }
- public class ERPOutPickDetail
- {
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string Lotno { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public int Qty { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProInboundModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProInboundModel.cs"
deleted file mode 100644
index 60c2be5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProInboundModel.cs"
+++ /dev/null
@@ -1,127 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鎴愬搧鍏ュ簱瀹屾垚涓婃姤ERP
- /// </summary>
- public class ERPProInboundModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- public string Code { get; set; }
- /// <summary>
- /// 鍒涘缓浜轰唬鐮�
- /// </summary>
- public string CreatorCode { get; set; }
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- public string CompanyCode { get; set; }
- /// <summary>
- /// 宸ュ巶浠ｅ彿
- /// </summary>
- public string FactoryCode { get; set; }
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 鍌ㄤ綅浠ｇ爜
- /// </summary>
- public string LocationCode { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- public string StockDate { get; set; }
- /// <summary>
- /// 澶囨敞(鑳舵鐮�)
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- /// 鍏ュ簱绫诲瀷
- /// </summary>
- public string StockFormType { get; set; }
- /// <summary>
- /// 鍏ュ簱鏄庣粏
- /// </summary>
- public List<ERPProItemsItem> StockFormItems { get; set; }
- }
- /// <summary>
- /// 鍏ュ簱涓婃姤鏄庣粏
- /// </summary>
- public class ERPProItemsItem
- {
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string PartNum { get; set; }
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- public string Rev { get; set; }
- /// <summary>
- /// 鍛ㄦ湡鐮�
- /// </summary>
- public string DateCode { get; set; }
- /// <summary>
- /// 鎵规(鍏ュ簱鍗曞彿+鎴愬搧缂栫爜+澶у皬鐗堟湰)mes鐢熸垚
- /// </summary>
- public string BatchNumber { get; set; }
- /// <summary>
- /// 鍙夋澘浣嶇疆
- /// </summary>
- public string XLocation { get; set; }
- /// <summary>
- /// 鍙夋澘鏁�
- /// </summary>
- public float Xqty { get; set; }
- /// <summary>
- /// Pnl鏁伴噺
- /// </summary>
- public float QtyPnl { get; set; }
- /// <summary>
- /// Set鏁伴噺
- /// </summary>
- public float QtySet { get; set; }
- /// <summary>
- /// Pcs鏁伴噺
- /// </summary>
- public float QtyPcs { get; set; }
- /// <summary>
- /// 宸ュ崟鏄庣粏
- /// </summary>
- public List<ERPProListItem> WoList { get; set; }
- }
- /// <summary>
- /// 鍏ュ簱宸ュ崟鏄庣粏
- /// </summary>
- public class ERPProListItem
- {
- /// <summary>
- /// 鍒堕�犺鍗�
- /// </summary>
- public string moNumber { get; set; }
- /// <summary>
- /// 宸ュ崟
- /// </summary>
- public string WoNumber { get; set; }
- /// <summary>
- /// Pcs鏁伴噺
- /// </summary>
- public float QtyPcs { get; set; }
- /// <summary>
- /// Set鏁伴噺
- /// </summary>
- public float QtySet { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProOutOrderModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProOutOrderModel.cs"
deleted file mode 100644
index 028250c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProOutOrderModel.cs"
+++ /dev/null
@@ -1,85 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鎴愬搧鍑哄簱鍥炰紶ERP
- /// </summary>
- public class ERPProOutOrderModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
- /// <summary>
- /// 鍙戞枡鍗曞彿
- /// </summary>
- public string StockOutCode { get; set; }
- /// <summary>
- ///搴撳瓨鎸囨淳鍛樹唬鐮�
- /// </summary>
- public string ConfirmedUserNo { get; set; }
- /// <summary>
- /// 鍑哄簱浜轰唬鐮�
- /// </summary>
- public string AssignUserNo { get; set; }
- /// <summary>
- /// 閫佽揣鏃ユ湡
- /// </summary>
- public string ShipDate { get; set; }
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 璁″垝鍑鸿揣鍗曞彿
- /// </summary>
- public string DeliverplanCode { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- /// 鏄庣粏璇︽儏
- /// </summary>
- public List<StockOutItemsItem> StockOutItems { get; set; }
- }
- /// <summary>
- /// 鍑哄簱鏄庣粏
- /// </summary>
- public class StockOutItemsItem
- {
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- public string PartNum { get; set; }
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- public string Rev { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- public string SoNumber { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string BatchNumber { get; set; }
- /// <summary>
- /// 澶囧搧鏁伴噺
- /// </summary>
- public float QtyFree { get; set; }
- /// <summary>
- /// PCS鏁伴噺
- /// </summary>
- public float QtyPcs { get; set; }
- /// <summary>
- /// 鍖呰SET鏁伴噺
- /// </summary>
- public float QtySet { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProStockCheckModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProStockCheckModel.cs"
deleted file mode 100644
index d5ab707..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProStockCheckModel.cs"
+++ /dev/null
@@ -1,129 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鎴愬搧鐩樼偣
- /// </summary>
- public class ERPProStockCheckModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// 1 鏂板
- /// </summary>
- public int Way { get; set; }
-
- /// <summary>
- /// 涓诲仴鍊�
- /// </summary>
- public string UniqueTag { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鍙�
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 鐩樼偣鍚嶇О
- /// </summary>
- public string Name { get; set; }
-
- /// <summary>
- /// 璐︽湡寮�濮嬫椂闂�
- /// 2023-01-01 鏍煎紡
- /// </summary>
- public string FiscalPeriotime { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- public string Createtime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string Createuser { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// "HA72灏炬暟浠撱�� HA71鎴愬搧浠撱�丠A73鐮斿彂浠�"
- /// </summary>
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<StockCheckItem> DataItem { get; set; }
- }
- public class StockCheckItem
- {
- /// <summary>
- /// 鍌ㄤ綅浠ｅ彿
- /// </summary>
- public string Location { get; set; }
-
- /// <summary>
- /// 鐢熶骇缂栫爜
- /// </summary>
- public string PartNum { get; set; }
-
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- public string PartRev { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
-
- /// <summary>
- /// 鎵规
- /// </summary>
- public string Lotno { get; set; }
-
- /// <summary>
- /// 鐩樼偣鍙夋澘鍗曞厓鏁�
- /// 鍙夋澘pcs鏁�
- /// </summary>
- public int QtyOfUnit_Alloc { get; set; }
-
- /// <summary>
- /// 鐩樼偣浜よ揣鏉挎暟
- /// 濂芥澘Set鏁�
- /// </summary>
- public int QtyOfArray { get; set; }
-
- /// <summary>
- /// 鐩樼偣鍗曞厓鏁�
- /// 濂芥澘pcs鏁�
- /// </summary>
- public int QtyOfUnit { get; set; }
-
- /// <summary>
- /// 绯荤粺搴撳瓨鍗曞厓鏁�
- /// 濂芥澘pcs鏁�
- /// </summary>
- public int SysQtyOfUnit { get; set; }
-
- /// <summary>
- /// 绯荤粺搴撳瓨鏉挎暟
- ///濂芥澘Set鏁�
- /// </summary>
- public int SysQtyOfArray { get; set; }
-
- /// <summary>
- /// 绯荤粺鍙夋澘搴撳瓨鍗曞厓鏁�
- /// 鍙夋澘pcs鏁�
- /// </summary>
- public int SysQtyOfUnit_Alloc { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProductCheckModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProductCheckModel.cs"
deleted file mode 100644
index 5c5ed4e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPProductCheckModel.cs"
+++ /dev/null
@@ -1,187 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鎴愬搧閫佹
- /// </summary>
- public class ERPProductCheckModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// 1 鏂板
- /// </summary>
- public int Way { get; set; }
-
- /// <summary>
- /// WMES涓诲仴鍊�
- /// </summary>
- public string UniqueTag { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 宸ュ巶浠ｅ彿
- /// </summary>
- public string PlantsCode { get; set; } = "HA02";
-
- /// <summary>
- /// 閫佹鍗曞彿
- /// </summary>
- public string RecheckCode { get; set; }
-
- /// <summary>
- /// 鐢熶骇鍨嬪彿
- /// </summary>
- public string PartNum { get; set; }
-
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- public string PartRev { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｅ彿
- /// "HA72灏炬暟浠撱�� HA71鎴愬搧浠撱�丠A73鐮斿彂浠�"
- /// </summary>
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 鍌ㄤ綅浠ｅ彿
- ///"HA72灏炬暟浠撱�� HA71鎴愬搧浠撱�丠A73鐮斿彂浠�"
- /// </summary>
- public string Location { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string LotNo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Node { get; set; }
-
- /// <summary>
- /// 鍚堟牸PCS鏁伴噺
- /// </summary>
- public int QtyPcs { get; set; }
-
- /// <summary>
- /// 鍚堟牸Set鏁伴噺
- /// </summary>
- public int QtyArray { get; set; }
-
- /// <summary>
- /// 鍚堟牸PNL鏁伴噺
- /// </summary>
- public int QtyPanel { get; set; }
-
- /// <summary>
- /// 閫佹PCS鏁伴噺
- /// </summary>
- public int QtyPcsRecieved { get; set; }
-
- /// <summary>
- /// 閫佹Set鏁伴噺
- /// </summary>
- public int QtyArrayRecieved { get; set; }
-
- /// <summary>
- /// 閫佹PNL鏁伴噺
- /// </summary>
- public int QtyPanelRecieved { get; set; }
-
- /// <summary>
- ///鎶ュ簾Pcs鏁伴噺
- /// </summary>
- public int QtyPcsScrapped { get; set; }
-
- /// <summary>
- /// 鎶ュ簾Set鏁伴噺
- /// </summary>
- public int QtyArrayScrapped { get; set; }
-
- /// <summary>
- /// 鎶ュ簾PNL鏁伴噺
- /// </summary>
- public int QtyPanelScrapped { get; set; }
-
- /// <summary>
- ///鎶芥Pcs鏁伴噺
- ///濡傛棤榛樿涓�0
- /// </summary>
- public int QtySample { get; set; }
-
-
- /// <summary>
- /// 鎺ユ敹鏃ユ湡
- /// 鏍煎紡锛歽yyy-MM-dd
- /// </summary>
- public string ReceiveDate { get; set; }
-
-
- /// <summary>
- /// 鍒涘缓浜轰唬鍙�
- /// </summary>
- public string CreatorCode { get; set; }
-
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// 鏍煎紡锛歽yyy-MM-dd
- /// </summary>
- public string TestDate { get; set; }
-
-
- /// <summary>
- ///
- /// </summary>
- public List<ProductCheckItem> IqcItem { get; set; }
-
- }
- public class ProductCheckItem
- {
- /// <summary>
- /// 缂洪櫡浠ｇ爜
- /// </summary>
- public string DefectCode { get; set; }
-
- /// <summary>
- /// 缁撴灉
- /// </summary>
- public string Result{ get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- public string TestDate { get; set; }
-
- /// <summary>
- /// PCS鏁伴噺
- /// </summary>
- public string QtyPcs { get; set; }
-
- /// <summary>
- /// Set鏁伴噺
- /// </summary>
- public string QtyArray { get; set; }
-
- /// <summary>
- /// PNL鏁伴噺
- /// </summary>
- public string QtyPanel { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Node { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPReceiveModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPReceiveModel.cs"
deleted file mode 100644
index 64e91b1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPReceiveModel.cs"
+++ /dev/null
@@ -1,139 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鏀惰揣鍗曞洖浼燛RP
- /// </summary>
- public class ERPReceiveModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
-
- /// <summary>
- /// WMS涓诲仴鍊�
- /// </summary>
- public string UniqueTag { get; set; }
-
- /// <summary>
- /// 鏀惰揣鍗曞彿
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- public string Type { get; set; }
-
- /// <summary>
- /// 鍏徃浠ｅ彿
- /// </summary>
- public string CompanyId { get; set; } = "HATC";
-
- /// <summary>
- /// 宸ュ巶浠ｅ彿
- /// </summary>
- public string PlantsId { get; set; } = "HA02";
-
- /// <summary>
- /// 瀹㈡埛浠ｅ彿
- /// </summary>
- public string CustomerId { get; set; } = "";
-
- /// <summary>
- /// 渚涘簲鍟嗕唬鍙�
- /// </summary>
- public string SuppliersId { get; set; } = "";
-
- /// <summary>
- /// 鏀惰揣鏃ユ湡
- /// </summary>
- public string ReceiveDate { get; set; }
-
- /// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
- public string DeliveryCode { get; set; } = "/";
-
- /// <summary>
- /// 浠撳簱浠ｅ彿
- /// </summary>
- public string WarehouseCode { get; set; } = "";
-
- /// <summary>
- /// 鍒涘缓浜轰唬鍙�
- /// </summary>
- public string CreatorId { get; set; } = "";
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public string EntDate { get; set; }
-
- public List<RecevieOrderDetailModel> Details { get; set; }
- }
-
- public class RecevieOrderDetailModel
- {
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- public string PurchaseOrderCode { get; set; }
-
- /// <summary>
- /// 閲囪喘鏄庣粏琛屽彿
- /// </summary>
- public int PurchaseOrderSerno { get; set; }
-
- /// <summary>
- /// 鏀惰揣鏄庣粏琛屽彿
- /// </summary>
- public int Serno { get; set; }
-
- /// <summary>
- /// 鏉愭枡缂栫爜
- /// </summary>
- public string MaterialsId { get; set; }
-
- /// <summary>
- /// 鏀惰揣鏁伴噺
- /// </summary>
- public float QtyRecieved { get; set; }
-
- /// <summary>
- /// 鏀惰揣鎵规
- /// </summary>
- public string Lotno { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗘壒娆�
- /// </summary>
- public string Supplotno { get; set; }
-
- /// <summary>
- /// 鏄惁瑕佹楠�
- /// </summary>
- public int IfInspection { get; set; }
-
- /// <summary>
- /// 鍚◣浠锋牸
- /// </summary>
- public int PriceInTax { get; set; } = 0;
-
- /// <summary>
- /// 绋庣巼
- /// </summary>
- public string Taxrate { get; set; } = "";
-
- /// <summary>
- /// 甯佸埆缂栫爜
- /// </summary>
- public string Currcode { get; set; } = "";
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPReturnModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPReturnModel.cs"
deleted file mode 100644
index c9ed632..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPReturnModel.cs"
+++ /dev/null
@@ -1,102 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 閫�鏂欏崟鍥炰紶ERP
- /// </summary>
- public class ERPReturnModel
- {
- /// <summary>
- /// 鎿嶄綔鍊�
- /// </summary>
- public int Way { get; set; }
- /// <summary>
- /// 涓婚敭鍊�
- /// </summary>
- public string UniqueTag { get; set; }
- /// <summary>
- /// 閫�鏂欏崟鍙�
- /// </summary>
- public string Code { get; set; }
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 鍗曟嵁澶囨敞
- /// </summary>
- public string Docremark { get; set; }
- /// <summary>
- /// 閫�鏂欐椂闂�
- /// </summary>
- public string Createtime { get; set; }
- /// <summary>
- /// 閫�鏂欎汉鍛�
- /// </summary>
- public string Createuser { get; set; }
- /// <summary>
- /// 鏄惁鐮斿彂
- /// </summary>
- public int IsDev { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<ReturnItem> Issitem { get; set; }
- }
- public class ReturnItem
- {
- /// <summary>
- /// 閫�鏂欑敵璇峰崟鍙�
- /// </summary>
- public string Pickcode { get; set; }
- /// <summary>
- /// 閫�鏂欒鍙�
- /// </summary>
- public int Rowindex { get; set; }
- /// <summary>
- /// 閫�鏂欎俊鎭�
- /// </summary>
- public List<ReturnPickItem> PickList { get; set; }
- }
-
- public class ReturnPickItem
- {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string Material { get; set; }
- /// <summary>
- /// 鎵规鏁伴噺鎬诲拰
- /// </summary>
- public float Qty { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<ReturnDataItem> Dataitem { get; set; }
- }
-
- public class ReturnDataItem
- {
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string Lotno { get; set; }
- /// <summary>
- /// 閫�鍥炴暟閲�
- /// </summary>
- public float Qty { get; set; }
- /// <summary>
- /// 鍌ㄥ尯
- /// </summary>
- public string Location { get; set; }
- /// <summary>
- /// 鍒堕�犻儴浠�
- /// </summary>
- public string Msfpart { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPScrapSheetModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPScrapSheetModel.cs"
deleted file mode 100644
index 788667f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPScrapSheetModel.cs"
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鎴愬搧鎶ュ簾
- /// </summary>
- public class ERPScrapSheetModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// 1 鏂板
- /// </summary>
- public int Way { get; set; }
-
- /// <summary>
- /// 涓诲仴鍊�
- /// </summary>
- public string UniqueTag { get; set; }
-
- /// <summary>
- /// 鎶ュ簾鍗曞彿
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- /// 鎶ュ簾鐘舵��
- /// Valid 宸叉牳鍑� 锛堥粯璁わ級TOChecked 寰呮牳鍑�
- /// </summary>
- public string Status { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- public string Createtime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string Createuser { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// "HA72灏炬暟浠撱�� HA71鎴愬搧浠撱�丠A73鐮斿彂浠�"
- /// </summary>
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
-
- public List<ScrapSheetItem> DataItem { get; set; }
- }
- public class ScrapSheetItem
- {
- /// <summary>
- /// 鐢熶骇缂栫爜
- /// </summary>
- public string PartNum { get; set; }
-
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- public string PartRev { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string Lotno { get; set; }
-
- /// <summary>
- /// 鎶ュ簾Set鏁�
- /// </summary>
- public int QtyOfArray { get; set; }
-
- /// <summary>
- /// 鎶ュ簾PCS鏁�
- /// </summary>
- public int QtyOfUnit { get; set; }
-
- /// <summary>
- /// 鎶ュ簾鍙夋澘SET鏁�
- /// </summary>
- public int QtyOfArray_Alloc { get; set; }
-
- /// <summary>
- /// 鎶ュ簾鍙夋澘PCS鏁�
- /// </summary>
- public int QtyOfUnit_Alloc { get; set; }
- }
-}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPTakeStockModel.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPTakeStockModel.cs"
deleted file mode 100644
index b021b54..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_External/Model/ERPTakeStockModel.cs"
+++ /dev/null
@@ -1,82 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_External.Model
-{
- /// <summary>
- /// 鐩樼偣鍗曞洖浼燛RP
- /// </summary>
- public class ERPTakeStockModel
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int Way { get; set; }
- /// <summary>
- /// 涓婚敭鍊�
- /// </summary>
- public string UniqueTag { get; set; }
- /// <summary>
- /// 鐩樼偣鍗曞彿
- /// </summary>
- public string Code { get; set; }
- /// <summary>
- /// 浼氳鏈熼棿
- /// </summary>
- public string FiscalPeriotime { get; set; }
- /// <summary>
- /// 鐩樼偣鍗曞悕绉�
- /// </summary>
- public string Name { get; set; }
- /// <summary>
- /// 浠撳簱浠ｅ彿
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 鍒涘缓浜轰唬鍙�
- /// </summary>
- public string Createuser { get; set; }
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- public string Createtime { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- /// 鐩樼偣鏄庣粏鍒楄〃
- /// </summary>
- public List<TakeDetailsItem> Details { get; set; }
- }
- public class TakeDetailsItem
- {
- /// <summary>
- /// 鏉愭枡缂栫爜
- /// </summary>
- public string MaterialsCode { get; set; }
- /// <summary>
- /// 鍌ㄥ尯
- /// </summary>
- public string LocationCode { get; set; }
- /// <summary>
- /// 鍐呴儴鎵规鍙�
- /// </summary>
- public string Lotno { get; set; }
- /// <summary>
- /// 璐﹂潰鏁伴噺
- /// </summary>
- public int Sysqty { get; set; }
- /// <summary>
- /// 瀹炵洏鏁伴噺
- /// </summary>
- public int Qty { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- }
-}
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 856fcba..36f3021 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"
@@ -29,7 +29,6 @@
using WIDESEA_Core.Enums;
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoRepository;
@@ -147,11 +146,6 @@
/// <param name="task"></param>
/// <returns></returns>
WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
- /// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
/// <summary>
/// 鎴愬搧绌烘鍥炲簱
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
index a3607a1..459a014 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
@@ -22,6 +22,12 @@
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮Id
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏉ユ簮Id")]
+ public int MaterialSourceId { get; set; }
/// <summary>
/// 浠撳簱缂栧彿
@@ -60,9 +66,9 @@
public decimal? MaterielLength { get; set; }
/// <summary>
- /// 鐗╂枡鐩村緞/楂樺害
+ /// 鐗╂枡鍘氬害
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鐩村緞/楂樺害")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍘氬害")]
public decimal? MaterielThickness { get; set; }
/// <summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs"
index bbd4433..deee875 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs"
@@ -12,7 +12,6 @@
using WIDESEA_Core;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
-using WIDESEA_DTO.MES;
using WIDESEA_Model.Models;
namespace WIDESEA_TaskInfoService
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs"
index 52ad0d5..2189143 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs"
@@ -7,7 +7,6 @@
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
-using WIDESEA_DTO.MES;
using WIDESEA_DTO;
using WIDESEA_Model.Models;
using WIDESEA_Core.Helper;
@@ -26,43 +25,6 @@
{
public partial class TaskService
{
- /// <summary>
- /// WMS鍚屾鎴愬搧鍑哄簱鑷矼ES
- /// </summary>
- public WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_ShipmentOrderSync.ToString());
- MESRoot<MesShipmentOrderSync> root = new MESRoot<MesShipmentOrderSync>()
- {
- From = "WMS",
- DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Content = model
- };
- JsonSerializerSettings settings = new JsonSerializerSettings
- {
- ContractResolver = new CamelCasePropertyNamesContractResolver()
- };
- string request = JsonConvert.SerializeObject(root, settings);
- string response = HttpMesHelper.Post(apiInfo.ApiAddress, request);
- MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
- //璋冪敤鎺ュ彛
- if (mesResponseContent.BSucc == true)
- {
- content.OK(mesResponseContent.StrMsg);
- }
- else
- {
- content.Error(mesResponseContent.StrMsg);
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs"
index 9c952e5..681d817 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs"
@@ -9,7 +9,6 @@
using WIDESEA_Core.Helper;
using WIDESEA_Core;
using WIDESEA_DTO;
-using WIDESEA_DTO.MES;
using WIDESEA_Model.Models;
namespace WIDESEA_TaskInfoService
@@ -32,36 +31,6 @@
responseContent.Error(ex.Message);
}
return responseContent;
- }
- }
- /// <summary>
- /// 闃茬剨绔嬪簱鍏ュ簱鍚庤皟鐢∕ES鎺ュ彛鑾峰彇鎵规淇℃伅
- /// </summary>
- /// <param name="LotNo"></param>
- /// <returns></returns>
- public MesSolderModel? GetProductByLot(string LotNo)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_GetProductByLot.ToString());
- string requestApi = apiInfo.ApiAddress + "?lotNo=" + LotNo;
- string response = HttpMesHelper.Post(requestApi);
- MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
- //璋冪敤鎺ュ彛
- if (mesResponseContent.BSucc == true)
- {
- MesSolderModel? mesSolder= mesResponseContent.Content.ToString()?.DeserializeObject<MesSolderModel>();
- return mesSolder;
- }
- else
- {
- throw new Exception(mesResponseContent.StrMsg);
- }
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
}
}
}
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 7e96894..92d5ee5 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"
@@ -19,7 +19,6 @@
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
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 5ddf32a..23efef7 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"
@@ -34,7 +34,6 @@
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_External.ERPService;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 9e7b0fb..aed5bb6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -35,131 +35,6 @@
_basicService = basicService;
_invokeERPService = invokeERPService;
}
- /// <summary>
- /// 鎺ㄩ�丒RP鍑哄簱
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeOutStandardsApi"), AllowAnonymous]
- public string InvokeOutStandardsApi([FromBody] ERPIssueModel issueModel)
- {
- return _invokeERPService.InvokeOutStandardsApi(issueModel);
- }
- /// <summary>
- /// 鎺ㄩ�丒RP鏀惰揣
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeMatReceiveApi"), AllowAnonymous]
- public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
- {
- return _invokeERPService.InvokeMatReceiveApi(receiveModel);
- }
- /// <summary>
- /// 鎺ㄩ�丒RP鏉ユ枡IQC璐ㄦ
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeCheckOrderApi"), AllowAnonymous]
- public string InvokeCheckOrderApi(ERPCheckModel checkModel)
- {
- return _invokeERPService.InvokeCheckOrderApi(checkModel);
- }
- /// <summary>
- /// 鎺ㄩ�丒RP鍏ュ簱
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeInboundOrderApi"), AllowAnonymous]
- public string InvokeInboundOrderApi([FromBody]ERPInboundModel inboundModel)
- {
- return _invokeERPService.InvokeInboundOrderApi(inboundModel);
- }
- /// <summary>
- /// 鎺ㄩ�丒RP閫�鏂欎笂鎶�
- /// </summary>
- [HttpPost, Route("InvokeReturnApi"), AllowAnonymous]
- public string InvokeReturnApi([FromBody] ERPReturnModel returnModel)
- {
- return _invokeERPService.InvokeReturnApi(returnModel);
- }
- /// <summary>
- /// ERP鐩樿耽/浜忎笂鎶ユ帴鍙ｈ皟鐢�
- /// </summary>
- [HttpPost, Route("InvokeTakeStockApi"), AllowAnonymous]
- public string InvokeTakeStockApi([FromBody] ERPTakeStockModel takeModel)
- {
- return _invokeERPService.InvokeTakeStockApi(takeModel);
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeProInApi"), AllowAnonymous]
- public string InvokeProInApi([FromBody] ERPProInboundModel inboundModel)
- {
- return _invokeERPService.InvokeProInApi(inboundModel);
- }
- /// <summary>
- /// ERP鎴愬搧鍑哄簱涓婃姤鎺ュ彛璋冪敤
- /// </summary>
- [HttpPost, Route("InvokeProOutApi"), AllowAnonymous]
- public string InvokeProOutApi([FromBody] ERPProOutOrderModel outOrderModel)
- {
- return _invokeERPService.InvokeProOutApi(outOrderModel);
- }
- /// <summary>
- /// 鎴愬搧浠撴鎶ュ簾鍑哄簱鎺ㄩ�丒RP
- /// </summary>
- /// <param name="checkModel"></param>
- /// <returns></returns>
- [HttpPost, Route("InvokeProCheckApi"), AllowAnonymous]
- public string InvokeProCheckApi([FromBody] ERPProductCheckModel checkModel)
- {
- return _invokeERPService.InvokeProCheckApi(checkModel);
- }
- /// <summary>
- /// 鎴愬搧瓒呭懆鏈熸姤搴熸帹閫丒Rp
- /// </summary>
- /// <param name="sheetModel"></param>
- /// <returns></returns>
- [HttpPost, Route("InvokeProScrapSheetApi"), AllowAnonymous]
- public string InvokeProScrapSheetApi([FromBody] ERPScrapSheetModel sheetModel)
- {
- return _invokeERPService.InvokeProScrapSheetApi(sheetModel);
- }
- /// <summary>
- /// 鎴愬搧鐩樼偣鐩樿耽/鐩樹簭
- /// </summary>
- /// <param name="stockCheckModel"></param>
- /// <returns></returns>
- [HttpPost, Route("InvokeProStockCheckApi"), AllowAnonymous]
- public string InvokeProStockCheckApi([FromBody] ERPProStockCheckModel stockCheckModel)
- {
- return _invokeERPService.InvokeProStockCheckApi(stockCheckModel);
- }
- /// <summary>
- /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeProSaleCustomer"), AllowAnonymous]
- public string InvokeProSaleCustomer(string saleOrder)
- {
- return _invokeERPService.InvokeProSaleCustomer(saleOrder);
- }
- /// <summary>
- /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeOutProErpSync"), AllowAnonymous]
- public string InvokeOutProErpSync(string outProOrderNo)
- {
- return _invokeERPService.InvokeOutProErpSync(outProOrderNo);
- }
- /// <summary>
- /// ERP鎴愬搧鍏ュ簱浜у搧鍨嬪彿闈㈢Н鏌ヨ
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("InvokeProInErpStatic"), AllowAnonymous]
- public string InvokeProInErpStatic(string partNum, string partNumWithRev)
- {
- return _invokeERPService.InvokeProInErpStatic(partNum, partNumWithRev);
- }
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
index fac5179..9267e56 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
@@ -7,7 +7,6 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_TaskInfoService;
using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
using WIDESEA_Core.Helper;
using Autofac.Core;
using WIDESEA_DTO.Stock;
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 7301155..5686b22 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"
@@ -7,7 +7,6 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_TaskInfoService;
using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
using WIDESEA_Core.Helper;
using Autofac.Core;
using WIDESEA_DTO.Stock;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs"
index fe07911..ada821c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs"
@@ -11,8 +11,6 @@
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Outbound;
using WIDESEA_DTO.System;
using WIDESEA_DTO.Task;
using WIDESEA_Model.Models;
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\344\270\200\346\234\237BSTERP\351\234\200\346\261\202\345\255\227\346\256\265.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\344\270\200\346\234\237BSTERP\351\234\200\346\261\202\345\255\227\346\256\265.xlsx"
index f743eb2..9b75a8f 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\344\270\200\346\234\237BSTERP\351\234\200\346\261\202\345\255\227\346\256\265.xlsx"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\344\270\200\346\234\237BSTERP\351\234\200\346\261\202\345\255\227\346\256\265.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\200\235\351\200\232ERPJSON\346\225\260\346\215\256\350\247\243\346\236\220.txt" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\200\235\351\200\232ERPJSON\346\225\260\346\215\256\350\247\243\346\236\220.txt"
new file mode 100644
index 0000000..d600b29
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\200\235\351\200\232ERPJSON\346\225\260\346\215\256\350\247\243\346\236\220.txt"
@@ -0,0 +1,726 @@
+--渚涘簲鍟嗕俊鎭�
+[
+ {
+ "way": 1,
+ "vendId": 1453,
+ "vendNo": "BLJ0001",
+ "shortName": "鍊嶅姏鏉�",
+ "businessContact": "姹儨鍒�/鍒樺伐",
+ "tel": "0512-62602957",
+ "address": "鑻忓窞宸ヤ笟鍥尯鍞涵闀囪捣鍙惰矾61鍙�",
+ "status": 1
+ }
+]
+
+way锛氭暟鎹幏鍙栨柟寮忔垨鏉ユ簮鏍囪瘑
+vendId锛氫緵搴斿晢鍞竴鏍囪瘑ID
+vendNo锛氫緵搴斿晢缂栧彿/浠ｇ爜
+shortName锛氫緵搴斿晢绠�绉�
+businessContact锛氬晢鍔¤仈绯讳汉
+tel锛氳仈绯荤數璇�
+address锛氬叕鍙稿湴鍧�
+status锛氱姸鎬佹爣璇嗭紙1琛ㄧず鍚敤/鏈夋晥鐘舵�侊級
+
+
+
+--鐩樼偣淇℃伅
+[
+ {
+ "way": 1,
+ "paperStktakeId": 1,
+ "paperStktakeNo": "6666",
+ "stktakeDate": null,
+ "warehouseId": null,
+ "warehouse": null,
+ "paperStktakeDetailList": []
+ }
+]
+
+way锛氭暟鎹幏鍙栨柟寮忔垨鏉ユ簮鏍囪瘑
+paperStktakeId锛氱焊璐ㄧ洏鐐瑰崟鍞竴鏍囪瘑ID
+paperStktakeNo锛氱焊璐ㄧ洏鐐瑰崟缂栧彿
+stktakeDate锛氱洏鐐规棩鏈燂紙null琛ㄧず鏈缃級
+warehouseId锛氫粨搴揑D锛坣ull琛ㄧず鏈寚瀹氾級
+warehouse锛氫粨搴撲俊鎭紙null琛ㄧず鏈寚瀹氾級
+paperStktakeDetailList锛氱焊璐ㄧ洏鐐瑰崟鏄庣粏鍒楄〃锛堢┖鏁扮粍琛ㄧず鏃犳槑缁嗛」锛�
+
+鏄庣粏鍒楄〃涓殑瀛楁璇存槑锛�
+barcode锛氭潯鐮佷俊鎭�
+materialNo锛氬師绾哥紪鐮�/鐗╂枡缂栧彿
+seqNo锛氭壒娆″彿/搴忓垪鍙�
+width锛氬箙瀹藉昂瀵�
+thickness锛氱焊绫诲帤搴�
+procurementLength锛氭�婚暱搴︼紙璁＄畻鍏紡锛氭暟閲�/(骞呭/1000)/閲嶉噺锛�
+quantity锛氭暟閲�
+unit锛氳閲忓崟浣�
+
+
+
+--棰嗘枡鍗�
+[
+ {
+ "way": 2,
+ "paperMattakeId": 30,
+ "paperMattakeNo": "MY151112001",
+ "mattakeDate": 1447257600000,
+ "employeeName": null,
+ "paperMattakeDetails": [
+ {
+ "paperMattakeId": 30,
+ "barcode": "151005005",
+ "materialNo": "70-RC",
+ "seqNo": 1,
+ "w": 1700.00,
+ "thick": 0.06,
+ "procurementLength": 0.51,
+ "qty": 91.00,
+ "unit": "Kg"
+ }
+ ]
+ }
+]
+
+way锛氭暟鎹幏鍙栨柟寮忔垨鏉ユ簮鏍囪瘑锛�2琛ㄧず鐗╂枡棰嗙敤鍗曪級
+paperMattakeId锛氫富琛↖D锛岀焊璐ㄧ墿鏂欓鐢ㄥ崟鍞竴鏍囪瘑
+paperMattakeNo锛氱焊璐ㄧ墿鏂欓鐢ㄥ崟缂栧彿
+mattakeDate锛氶鐢ㄦ棩鏈燂紙鏃堕棿鎴虫牸寮忥紝1447257600000琛ㄧず2015-11-12锛�
+employeeName锛氬憳宸ュ鍚嶏紙null琛ㄧず鏈寚瀹氾級
+paperMattakeDetails锛氱焊璐ㄧ墿鏂欓鐢ㄥ崟鏄庣粏鍒楄〃
+
+鏄庣粏鍒楄〃涓殑瀛楁璇存槑锛�
+paperMattakeId锛氬叧鑱旂殑涓昏〃ID
+barcode锛氭潯鐮佷俊鎭�
+materialNo锛氱墿鏂欑紪鍙�
+seqNo锛氭壒娆″彿/搴忓垪鍙�
+w锛氬箙瀹藉昂瀵革紙鍗曚綅锛歮m锛�
+thick锛氬帤搴︼紙鍗曚綅锛歮m鎴栧叾浠栧帤搴﹀崟浣嶏級
+procurementLength锛氶噰璐暱搴�/璁＄畻闀垮害
+qty锛氭暟閲�
+unit锛氳閲忓崟浣嶏紙Kg琛ㄧず鍗冨厠锛�
+
+
+--楠屾敹鍗曚俊鎭�
+
+[
+ {
+ "way": 1,
+ "paperReceiptId": 56,
+ "paperReceiptNo": "IY151126001",
+ "vendNo": "WH001",
+ "totalProcurementLength": 157.365585850402425194261013530194759368896484375,
+ "receiptDate": 1448467200000,
+ "remark": null,
+ "paperReceiptDetails": [
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126001",
+ "materialNo": "I1-RC",
+ "seqNo": 1,
+ "w": 2000.00,
+ "thick": 0.17,
+ "procurementLength": 7.48,
+ "deliveryQty": 1946.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126002",
+ "materialNo": "I1-RC",
+ "seqNo": 2,
+ "w": 2000.00,
+ "thick": 0.17,
+ "procurementLength": 7.32,
+ "deliveryQty": 1903.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126018",
+ "materialNo": "U1-RC",
+ "seqNo": 1,
+ "w": 2300.00,
+ "thick": 0.20,
+ "procurementLength": 5.88,
+ "deliveryQty": 2165.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126019",
+ "materialNo": "U1-RC",
+ "seqNo": 1,
+ "w": 2200.00,
+ "thick": 0.20,
+ "procurementLength": 5.87,
+ "deliveryQty": 2066.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126020",
+ "materialNo": "U1-RC",
+ "seqNo": 1,
+ "w": 2050.00,
+ "thick": 0.20,
+ "procurementLength": 6.42,
+ "deliveryQty": 2105.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126003",
+ "materialNo": "I1-RC",
+ "seqNo": 1,
+ "w": 2400.00,
+ "thick": 0.17,
+ "procurementLength": 7.36,
+ "deliveryQty": 2297.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126004",
+ "materialNo": "I1-RC",
+ "seqNo": 2,
+ "w": 2400.00,
+ "thick": 0.17,
+ "procurementLength": 7.30,
+ "deliveryQty": 2277.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126005",
+ "materialNo": "I1-RC",
+ "seqNo": 3,
+ "w": 2400.00,
+ "thick": 0.17,
+ "procurementLength": 7.35,
+ "deliveryQty": 2293.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126006",
+ "materialNo": "I1-RC",
+ "seqNo": 1,
+ "w": 2300.00,
+ "thick": 0.17,
+ "procurementLength": 7.63,
+ "deliveryQty": 2282.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126007",
+ "materialNo": "P1-RC",
+ "seqNo": 1,
+ "w": 1950.00,
+ "thick": 0.10,
+ "procurementLength": 8.93,
+ "deliveryQty": 1916.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126008",
+ "materialNo": "P1-RC",
+ "seqNo": 2,
+ "w": 1950.00,
+ "thick": 0.10,
+ "procurementLength": 8.89,
+ "deliveryQty": 1907.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126009",
+ "materialNo": "P1-RC",
+ "seqNo": 1,
+ "w": 2500.00,
+ "thick": 0.10,
+ "procurementLength": 8.74,
+ "deliveryQty": 2404.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126010",
+ "materialNo": "P1-RC",
+ "seqNo": 2,
+ "w": 2500.00,
+ "thick": 0.10,
+ "procurementLength": 8.74,
+ "deliveryQty": 2403.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126011",
+ "materialNo": "P1-RC",
+ "seqNo": 1,
+ "w": 2350.00,
+ "thick": 0.10,
+ "procurementLength": 8.74,
+ "deliveryQty": 2258.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126012",
+ "materialNo": "P1-RC",
+ "seqNo": 2,
+ "w": 2350.00,
+ "thick": 0.10,
+ "procurementLength": 8.65,
+ "deliveryQty": 2235.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126013",
+ "materialNo": "P1-RC",
+ "seqNo": 1,
+ "w": 2250.00,
+ "thick": 0.10,
+ "procurementLength": 8.83,
+ "deliveryQty": 2185.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126014",
+ "materialNo": "P1-RC",
+ "seqNo": 2,
+ "w": 2250.00,
+ "thick": 0.10,
+ "procurementLength": 8.71,
+ "deliveryQty": 2156.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126015",
+ "materialNo": "P1-RC",
+ "seqNo": 1,
+ "w": 2150.00,
+ "thick": 0.10,
+ "procurementLength": 8.48,
+ "deliveryQty": 2005.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126016",
+ "materialNo": "P1-RC",
+ "seqNo": 1,
+ "w": 2050.00,
+ "thick": 0.10,
+ "procurementLength": 8.15,
+ "deliveryQty": 1838.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126017",
+ "materialNo": "P1-RC",
+ "seqNo": 2,
+ "w": 2050.00,
+ "thick": 0.10,
+ "procurementLength": 7.90,
+ "deliveryQty": 1781.00,
+ "unit": "Kg"
+ }
+ ]
+ },
+ {
+ "way": 2,
+ "paperReceiptId": 56,
+ "paperReceiptNo": "IY151126001",
+ "vendNo": "WH001",
+ "totalProcurementLength": 157.365585850402425194261013530194759368896484375,
+ "receiptDate": 1448467200000,
+ "remark": null,
+ "paperReceiptDetails": [
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126001",
+ "materialNo": "I1-RC",
+ "seqNo": 1,
+ "w": 2000.00,
+ "thick": 0.17,
+ "procurementLength": 7.48,
+ "deliveryQty": 1946.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126002",
+ "materialNo": "I1-RC",
+ "seqNo": 2,
+ "w": 2000.00,
+ "thick": 0.17,
+ "procurementLength": 7.32,
+ "deliveryQty": 1903.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126018",
+ "materialNo": "U1-RC",
+ "seqNo": 1,
+ "w": 2300.00,
+ "thick": 0.20,
+ "procurementLength": 5.88,
+ "deliveryQty": 2165.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126019",
+ "materialNo": "U1-RC",
+ "seqNo": 1,
+ "w": 2200.00,
+ "thick": 0.20,
+ "procurementLength": 5.87,
+ "deliveryQty": 2066.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126020",
+ "materialNo": "U1-RC",
+ "seqNo": 1,
+ "w": 2050.00,
+ "thick": 0.20,
+ "procurementLength": 6.42,
+ "deliveryQty": 2105.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126003",
+ "materialNo": "I1-RC",
+ "seqNo": 1,
+ "w": 2400.00,
+ "thick": 0.17,
+ "procurementLength": 7.36,
+ "deliveryQty": 2297.00,
+ "unit": "Kg"
+ },
+ {
+ "paperReceiptId": 56,
+ "barcode": "151126004",
+ "materialNo": "I1-RC",
+ "seqNo": 2,
+ "w": 2400.00,
+ "thick": 鏋侀暱鐨凧SON鏁版嵁锛屾澶勭渷鐣ラ噸澶嶅唴瀹�...
+ }
+ ]
+ }
+]
+
+way锛氭暟鎹幏鍙栨柟寮忔爣璇嗭紙1锛氱焊璐ㄦ敹璐у崟锛�2锛氬叾浠栫被鍨嬶級
+paperReceiptId锛氱焊璐ㄦ敹璐у崟涓昏〃ID
+paperReceiptNo锛氱焊璐ㄦ敹璐у崟缂栧彿
+vendNo锛氫緵搴斿晢缂栧彿
+totalProcurementLength锛氭�婚噰璐暱搴�
+receiptDate锛氭敹璐ф棩鏈燂紙鏃堕棿鎴虫牸寮忥紝1448467200000琛ㄧず2015-11-26锛�
+remark锛氬娉ㄤ俊鎭紙null琛ㄧず鏃犲娉級
+paperReceiptDetails锛氱焊璐ㄦ敹璐у崟鏄庣粏鍒楄〃
+
+鏄庣粏鍒楄〃瀛楁璇存槑锛�
+paperReceiptId锛氬叧鑱旂殑涓昏〃ID
+barcode锛氱墿鏂欐潯鐮�
+materialNo锛氱墿鏂欑紪鍙�
+seqNo锛氭壒娆″簭鍒楀彿
+w锛氬箙瀹斤紙鍗曚綅锛歮m锛�
+thick锛氬帤搴�
+procurementLength锛氶噰璐暱搴�/璁＄畻闀垮害
+deliveryQty锛氫氦璐ф暟閲�
+unit锛氳閲忓崟浣嶏紙Kg锛氬崈鍏嬶級
+
+
+
+--鐢熶骇閫�鏂�
+[
+ {
+ "way": 2,
+ "paperWreturnId": 7814,
+ "paperWreturnNo": "MRY160113130",
+ "wreturnDate": 1452614400000,
+ "employeeName": null,
+ "bstPaperWreturnDetails": [
+ {
+ "paperWreturnId": 7814,
+ "barcode": "160112022",
+ "materialNo": "61-RC",
+ "seqNo": 1,
+ "w": 1300.00,
+ "thick": 0.10,
+ "procurementLength": 9.15,
+ "qty": 1071.00,
+ "unit": "Kg"
+ }
+ ]
+ }
+]
+
+way锛氭暟鎹幏鍙栨柟寮忔爣璇嗭紙2琛ㄧず绾歌川閫�鏂欏崟锛�
+paperWreturnId锛氱焊璐ㄩ��鏂欏崟涓昏〃ID
+paperWreturnNo锛氱焊璐ㄩ��鏂欏崟缂栧彿
+wreturnDate锛氶��鏂欐棩鏈燂紙鏃堕棿鎴虫牸寮忥紝1452614400000琛ㄧず2016-01-13锛�
+employeeName锛氬憳宸ュ鍚嶏紙null琛ㄧず鏈寚瀹氾級
+bstPaperWreturnDetails锛氱焊璐ㄩ��鏂欏崟鏄庣粏鍒楄〃
+
+鏄庣粏鍒楄〃瀛楁璇存槑锛�
+paperWreturnId锛氬叧鑱旂殑涓昏〃ID
+barcode锛氱墿鏂欐潯鐮�
+materialNo锛氱墿鏂欑紪鍙�
+seqNo锛氭壒娆″簭鍒楀彿
+w锛氬箙瀹斤紙鍗曚綅锛歮m锛�
+thick锛氬帤搴�
+procurementLength锛氶噰璐暱搴�/璁＄畻闀垮害
+qty锛氶��鏂欐暟閲�
+unit锛氳閲忓崟浣嶏紙Kg锛氬崈鍏嬶級
+
+
+
+
+--閲囪喘閫�璐�
+[
+ {
+ "way": 2,
+ "paperVreturnId": 12,
+ "paperVreturnNo": "RY160305001",
+ "vreturnDate": 1457107200000,
+ "warehouseId": 3,
+ "warehouse": "鍘熺焊浠�",
+ "vendNo": "LP001",
+ "vendName": "鏋楀钩绾镐笟",
+ "paperVreturnDetails": [
+ {
+ "paperVreturnId": 12,
+ "barcode": "160301018",
+ "materialNo": "61-LP",
+ "seqNo": 1,
+ "w": 2250.00,
+ "thick": 0.00,
+ "procurementLength": 8.05,
+ "qty": 1630.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160228032",
+ "materialNo": "61-LP",
+ "seqNo": 1,
+ "w": 1800.00,
+ "thick": 0.00,
+ "procurementLength": 7.63,
+ "qty": 1236.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160228033",
+ "materialNo": "61-LP",
+ "seqNo": 2,
+ "w": 1800.00,
+ "thick": 0.00,
+ "procurementLength": 8.09,
+ "qty": 1310.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160228026",
+ "materialNo": "61-LP",
+ "seqNo": 1,
+ "w": 1300.00,
+ "thick": 0.00,
+ "procurementLength": 8.58,
+ "qty": 1004.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160228027",
+ "materialNo": "61-LP",
+ "seqNo": 2,
+ "w": 1300.00,
+ "thick": 0.00,
+ "procurementLength": 7.80,
+ "qty": 913.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160301010",
+ "materialNo": "61-LP",
+ "seqNo": 2,
+ "w": 1800.00,
+ "thick": 0.00,
+ "procurementLength": 8.04,
+ "qty": 1302.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160228046",
+ "materialNo": "61-LP",
+ "seqNo": 1,
+ "w": 2250.00,
+ "thick": 0.00,
+ "procurementLength": 7.77,
+ "qty": 1573.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160228048",
+ "materialNo": "61-LP",
+ "seqNo": 2,
+ "w": 2400.00,
+ "thick": 0.00,
+ "procurementLength": 8.22,
+ "qty": 1775.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "160221021",
+ "materialNo": "61",
+ "seqNo": 1,
+ "w": 1300.00,
+ "thick": 0.10,
+ "procurementLength": 7.88,
+ "qty": 922.00,
+ "unit": "Kg"
+ },
+ {
+ "paperVreturnId": 12,
+ "barcode": "鏋侀暱鐨凧SON鏁版嵁锛屾澶勭渷鐣ラ儴鍒嗗唴瀹�..."
+ }
+ ]
+ }
+]
+
+way锛氭暟鎹幏鍙栨柟寮忔爣璇嗭紙2琛ㄧず绾歌川閫�璐у崟锛�
+paperVreturnId锛氱焊璐ㄩ��璐у崟涓昏〃ID
+paperVreturnNo锛氱焊璐ㄩ��璐у崟缂栧彿
+vreturnDate锛氶��璐ф棩鏈燂紙鏃堕棿鎴虫牸寮忥紝1457107200000琛ㄧず2016-03-05锛�
+warehouseId锛氫粨搴揑D锛�3琛ㄧず鍘熺焊浠擄級
+warehouse锛氫粨搴撳悕绉�
+vendNo锛氫緵搴斿晢缂栧彿
+vendName锛氫緵搴斿晢鍚嶇О
+paperVreturnDetails锛氱焊璐ㄩ��璐у崟鏄庣粏鍒楄〃
+
+鏄庣粏鍒楄〃瀛楁璇存槑锛�
+paperVreturnId锛氬叧鑱旂殑涓昏〃ID
+barcode锛氱墿鏂欐潯鐮�
+materialNo锛氱墿鏂欑紪鍙�
+seqNo锛氭壒娆″簭鍒楀彿
+w锛氬箙瀹斤紙鍗曚綅锛歮m锛�
+thick锛氬帤搴︼紙0.00琛ㄧず鍘氬害鏈褰曟垨涓洪浂锛�
+procurementLength锛氶噰璐暱搴�/璁＄畻闀垮害
+qty锛氶��璐ф暟閲�
+unit锛氳閲忓崟浣嶏紙Kg锛氬崈鍏嬶級
+
+
+--鐗╂枡淇℃伅
+[
+ {
+ "way": 2,
+ "materialId": 1,
+ "materialNo": "I2",
+ "name": "140gA绾х墰鍗�",
+ "spec": "",
+ "materielType": 3,
+ "materielWide": 0,
+ "materielThickness": 0,
+ "materielLength": 0,
+ "weight": 0.14000000000000001332267629550187848508358001708984375,
+ "unit": "Kg",
+ "invOrgId": 1,
+ "status": 1
+ }
+]
+
+way锛氭暟鎹幏鍙栨柟寮忔爣璇嗭紙2琛ㄧず鐗╂枡鍩虹淇℃伅锛�
+materialId锛氱墿鏂欏敮涓�鏍囪瘑ID
+materialNo锛氱墿鏂欑紪鍙�/浠ｇ爜
+name锛氱墿鏂欏悕绉�
+spec锛氱墿鏂欒鏍硷紙绌哄瓧绗︿覆琛ㄧず鏃犺鏍硷級
+materielType锛氱墿鏂欑被鍨嬶紙3琛ㄧず鐗瑰畾鍒嗙被锛�
+materielWide锛氱墿鏂欏搴︼紙0琛ㄧず鏈缃級
+materielThickness锛氱墿鏂欏帤搴︼紙0琛ㄧず鏈缃級
+materielLength锛氱墿鏂欓暱搴︼紙0琛ㄧず鏈缃級
+weight锛氱墿鏂欓噸閲忥紙鍗曚綅閲嶉噺锛岀簿纭暟鍊硷級
+unit锛氳閲忓崟浣嶏紙Kg锛氬崈鍏嬶級
+invOrgId锛氬簱瀛樼粍缁嘔D锛�1琛ㄧず榛樿搴撳瓨缁勭粐锛�
+status锛氱姸鎬佹爣璇嗭紙1琛ㄧず鍚敤/鏈夋晥鐘舵�侊級
+
+
+--鎺掔▼淇℃伅
+[{
+ "way": 2,
+ "boardMpsId": 21,
+ "boardMpsNo": "PP151125001",
+ "productionDate": 1448380800000,
+ "bstBoardMpsDetails": [{
+ "boardMpsId": 21,
+ "width": 2500.00,
+ "xqLen": 1121.18,
+ "totalUsage": 476.50,
+ "materialId": 38,
+ "materialNo": "E2",
+ "procurementLength": 1121.18
+ }, {
+ "boardMpsId": 21,
+ "width": 2500.00,
+ "xqLen": 1479.96,
+ "totalUsage": 406.99,
+ "materialId": 6,
+ "materialNo": "71",
+ "procurementLength": 1479.96
+ }, {
+ "boardMpsId": 21,
+ "width": 2500.00,
+ "xqLen": 1121.18,
+ "totalUsage": 308.32,
+ "materialId": 8,
+ "materialNo": "P1",
+ "procurementLength": 1121.16
+ }, {
+ "boardMpsId": 21,
+ "width": 2500.00,
+ "xqLen": 1816.29,
+ "totalUsage": 771.92,
+ "materialId": 38,
+ "materialNo": "E2",
+ "procurementLength": 1816.28
+ }]
+}]
+
+way锛氭暟鎹幏鍙栨柟寮忔爣璇嗭紙2琛ㄧず绾告澘鐢熶骇璁″垝锛�
+boardMpsId锛氱焊鏉夸富鐢熶骇璁″垝ID
+boardMpsNo锛氱焊鏉夸富鐢熶骇璁″垝缂栧彿
+productionDate锛氱敓浜ф棩鏈燂紙鏃堕棿鎴虫牸寮忥紝1448380800000琛ㄧず2015-11-25锛�
+bstBoardMpsDetails锛氱焊鏉跨敓浜ц鍒掓槑缁嗗垪琛�
+
+鏄庣粏鍒楄〃瀛楁璇存槑锛�
+boardMpsId锛氬叧鑱旂殑涓昏〃ID
+width锛氬箙瀹�/瀹藉害锛堝崟浣嶏細mm锛�
+xqLen锛氶渶姹傞暱搴�
+totalUsage锛氭�荤敤閲弒
+materialId锛氱墿鏂橧D
+materialNo锛氱墿鏂欑紪鍙�
+procurementLength锛氶噰璐暱搴�/璁＄畻闀垮害
+
+
+
+
+
+
+
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\226\257\351\200\232\345\210\251\346\213\223\346\216\245\345\217\243.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\226\257\351\200\232\345\210\251\346\213\223\346\216\245\345\217\243.xlsx"
new file mode 100644
index 0000000..03f9aee
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\226\257\351\200\232\345\210\251\346\213\223\346\216\245\345\217\243.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/\346\210\220\345\223\201\350\276\223\351\200\201\347\272\277\351\200\232\350\256\257\345\215\217\350\256\256_20250707.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/\346\210\220\345\223\201\350\276\223\351\200\201\347\272\277\351\200\232\350\256\257\345\215\217\350\256\256_20250707.xlsx"
index dc6a722..7be7af8 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/\346\210\220\345\223\201\350\276\223\351\200\201\347\272\277\351\200\232\350\256\257\345\215\217\350\256\256_20250707.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/\346\210\220\345\223\201\350\276\223\351\200\201\347\272\277\351\200\232\350\256\257\345\215\217\350\256\256_20250707.xlsx"
Binary files differ
--
Gitblit v1.9.3