From 0bb8fa57f20980f869cb1780a7594ef3ea7d576e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 11 六月 2025 21:08:27 +0800
Subject: [PATCH] 111
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cbb2749c-e26a-40e0-8942-21d353d51a87.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/QMSReceiveCheckModel.cs | 1
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/546a11e0-2bd3-4903-841b-15b52533e4a5.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d3040580-b0c0-4b7f-9042-dbd4f6a9f170.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/98ed975f-9c5d-4415-a74e-4ea6f143bac6.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs | 5 ++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs | 65 ++++++++++++++++----------------
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f92882d8-4e0e-4795-94b2-8f092cc43277.vsidx | 0
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ad44b81-9ed8-4255-81aa-b4f028e8b1a1.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b3ff8cae-0d0c-44b1-81c8-76364bcbcc59.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/95dfa365-884c-4ece-a3ca-62ce53715147.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 4 +-
13 files changed, 39 insertions(+), 36 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/437eaad1-d4b0-4025-a3d0-f20e51f16d43.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/546a11e0-2bd3-4903-841b-15b52533e4a5.vsidx"
similarity index 69%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/437eaad1-d4b0-4025-a3d0-f20e51f16d43.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/546a11e0-2bd3-4903-841b-15b52533e4a5.vsidx"
index ff69b78..7b5a31e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/437eaad1-d4b0-4025-a3d0-f20e51f16d43.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/546a11e0-2bd3-4903-841b-15b52533e4a5.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/73055691-0933-46e5-8aec-b97ad0bfe09e.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b3ff8cae-0d0c-44b1-81c8-76364bcbcc59.vsidx"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/73055691-0933-46e5-8aec-b97ad0bfe09e.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b3ff8cae-0d0c-44b1-81c8-76364bcbcc59.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/3f7cc6f5-3187-454f-b270-cee6e70c2744.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d3040580-b0c0-4b7f-9042-dbd4f6a9f170.vsidx"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/3f7cc6f5-3187-454f-b270-cee6e70c2744.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d3040580-b0c0-4b7f-9042-dbd4f6a9f170.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4f9889c8-bc2e-456e-9b47-f0fa2eeb365c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f92882d8-4e0e-4795-94b2-8f092cc43277.vsidx"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4f9889c8-bc2e-456e-9b47-f0fa2eeb365c.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f92882d8-4e0e-4795-94b2-8f092cc43277.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/02143a0b-3339-4244-b940-0fc56a40a2ae.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/02143a0b-3339-4244-b940-0fc56a40a2ae.vsidx"
deleted file mode 100644
index 6e76dd2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/02143a0b-3339-4244-b940-0fc56a40a2ae.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ad44b81-9ed8-4255-81aa-b4f028e8b1a1.vsidx"
similarity index 78%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ad44b81-9ed8-4255-81aa-b4f028e8b1a1.vsidx"
index e407628..0baccd1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/70239ec4-f79f-45a1-a15d-2edc3d3b13f0.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ad44b81-9ed8-4255-81aa-b4f028e8b1a1.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/95dfa365-884c-4ece-a3ca-62ce53715147.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/95dfa365-884c-4ece-a3ca-62ce53715147.vsidx"
new file mode 100644
index 0000000..1615d83
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/95dfa365-884c-4ece-a3ca-62ce53715147.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a781aea4-6c55-46f2-8bc0-4e65a884c665.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/98ed975f-9c5d-4415-a74e-4ea6f143bac6.vsidx"
similarity index 72%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a781aea4-6c55-46f2-8bc0-4e65a884c665.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/98ed975f-9c5d-4415-a74e-4ea6f143bac6.vsidx"
index 4993ef6..2403ef5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a781aea4-6c55-46f2-8bc0-4e65a884c665.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/98ed975f-9c5d-4415-a74e-4ea6f143bac6.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ef8b54ea-95e6-4615-a7de-9b16de52a1b0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cbb2749c-e26a-40e0-8942-21d353d51a87.vsidx"
similarity index 75%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ef8b54ea-95e6-4615-a7de-9b16de52a1b0.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cbb2749c-e26a-40e0-8942-21d353d51a87.vsidx"
index 26e693a..3af5836 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ef8b54ea-95e6-4615-a7de-9b16de52a1b0.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cbb2749c-e26a-40e0-8942-21d353d51a87.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/QMSReceiveCheckModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/QMSReceiveCheckModel.cs"
index f1ade45..f100417 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/QMSReceiveCheckModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/QMSReceiveCheckModel.cs"
@@ -8,6 +8,7 @@
{
public class QMSReceiveCheckModel
{
+ public string UniqueTag { get; set; }
/// <summary>
/// 鏀惰揣鍗曞彿
/// </summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
index cfd7567..2e99a29 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
@@ -329,40 +329,9 @@
}
_inboundRepository.ReceiveOrderRepository.UpdateData(receiveOrder);
_inboundRepository.PurchaseOrderDetailRepository.UpdateData(purchaseOrderDetail);
-
-
- QMSReceiveCheckModel qMSReceiveCheck = new QMSReceiveCheckModel()
- {
- EntryNumber=receiveOrder.ReceiveOrderNo,
- MaterialCode=receiveOrderDetail.MaterielCode,
- MaterialName=receiveOrderDetail.MaterielName,
- Quantity=(decimal)receiveOrderDetail.ReceivedQuantity,
- SupplierCode=receiveOrder.SuppliersId,
- SupplierName= supplierInfo.SupplierName,
- BatchNumber=receiveOrderDetail.LotNo,
- DeliveryNumber=receiveOrder.DeliveryCode,
- PurchaseNumber=receiveOrderDetail.PurchaseOrderNo,
- RowNumber= receiveOrderDetail.RowNo,
- WarehouseCode= warehouse.WarehouseCode,
- ReceiptDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Remark=" "
- };
- string response = _invokeQMSService.InvokeReceiveCheckApi(qMSReceiveCheck);
- MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
- if (!mesResponseContent.BSucc)
- {
- throw new Exception(mesResponseContent.StrMsg);
- }
- ReceiveResultDTO receiveResult = JsonConvert.DeserializeObject<ReceiveResultDTO>(mesResponseContent.Content.ToString());
- if (receiveResult==null)
- {
- throw new Exception("鎺ユ敹QMS缁撴灉澶辫触");
- }
- #region 娉ㄩ噴
if (materielInfo.IsCheck == WhetherEnum.True)
{
Dt_CheckOrder checkOrder = _mapper.Map<Dt_CheckOrder>(receiveOrderDetail);
- checkOrder.CheckOrderNo = receiveResult.InspectionNumber;
checkOrder.ReceiveOrderNo = receiveOrder.ReceiveOrderNo;
checkOrder.Result = CheckAcceptEnum.NotCheckAccept.ToString();
checkOrder.QualifiedQuantity = 0;
@@ -372,9 +341,39 @@
checkOrder.MaterielSpec = materielInfo.MaterielSpec;
checkOrder.ReturnQuantity = 0;
checkOrder.DefectedQuantity = 0;
- _checkOrderRepository.AddData(checkOrder);
+ int id = _checkOrderRepository.AddData(checkOrder);
+ QMSReceiveCheckModel qMSReceiveCheck = new QMSReceiveCheckModel()
+ {
+ UniqueTag = id.ToString(),
+ EntryNumber = receiveOrder.ReceiveOrderNo,
+ MaterialCode = receiveOrderDetail.MaterielCode,
+ MaterialName = receiveOrderDetail.MaterielName,
+ Quantity = (decimal)receiveOrderDetail.ReceivedQuantity,
+ SupplierCode = receiveOrder.SuppliersId,
+ SupplierName = supplierInfo.SupplierName,
+ BatchNumber = receiveOrderDetail.LotNo,
+ DeliveryNumber = receiveOrder.DeliveryCode,
+ PurchaseNumber = receiveOrderDetail.PurchaseOrderNo,
+ RowNumber = receiveOrderDetail.RowNo,
+ WarehouseCode = warehouse.WarehouseCode,
+ ReceiptDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Remark = " "
+ };
+ string response = _invokeQMSService.InvokeReceiveCheckApi(qMSReceiveCheck);
+ MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
+ if (!mesResponseContent.BSucc)
+ {
+ throw new Exception(mesResponseContent.StrMsg);
+ }
+ ReceiveResultDTO? receiveResult = JsonConvert.DeserializeObject<ReceiveResultDTO>(mesResponseContent.Content.ToString());
+ if (receiveResult == null)
+ {
+ throw new Exception("鎺ユ敹QMS缁撴灉澶辫触");
+ }
+ Dt_CheckOrder _CheckOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderId == id);
+ _CheckOrder.CheckOrderNo = receiveResult.InspectionNumber;
+ _checkOrderRepository.UpdateData(_CheckOrder);
}
- #endregion
_unitOfWorkManage.CommitTran();
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
index cbdf94b..0e09293 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
@@ -94,7 +94,10 @@
TaskStatus = 0,
TaskType = TaskTypeEnum.Relocation.ObjToInt()
};
-
+ if (stockInfo.StockLength>0)
+ {
+ newTask.TaskLength = stockInfo.StockLength;
+ }
_unitOfWorkManage.BeginTran();
Repository.AddData(newTask);
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
index 7f37857..6f7f214 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
@@ -254,9 +254,9 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost, Route("CheckResultReturn"), AllowAnonymous, MethodParamsValidate]
- public MesResponseContent CheckResultReturn([FromBody] ERPCheckModel model)
+ public MesResponseContent CheckResultReturn([FromBody] Root<ERPCheckModel> model)
{
- string content = _invokeERPService.InvokeCheckOrderApi(model);
+ string content = _invokeERPService.InvokeCheckOrderApi(model.Content);
ErpRequestContent requestContent = content.DeserializeObject<ErpRequestContent>();
if (requestContent.res != 1)
{
--
Gitblit v1.9.3