From 39ee9078d88fd4787437360e7f69ed999aaf0b7b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 28 十二月 2024 09:14:41 +0800
Subject: [PATCH] 更新代码
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs | 82 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 40 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
index e309926..d18e849 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
@@ -139,7 +139,7 @@
CustomerId = receiveOrder.CustomerId,
CreatorId = "TC20082",//娴嬭瘯 receiveOrder.Creater
EntDate = receiveOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
- ReceiveDate = receiveOrder.ReceiveDate.ToString("yyyy-MM-dd HH:mm:ss"),
+ ReceiveDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
PlantsId = "HA02",
SuppliersId = receiveOrder.SuppliersId,
Type = Enum.GetName(typeof(ReceiveOrderTypeEnum),receiveOrder.ReceiveOrderType),
@@ -155,12 +155,10 @@
{
return WebResponseContent.Instance.Error(erpRequest.Data);
}
+ //鏇存柊鏀惰揣鍗曚俊鎭�
receiveOrder.ReceiveOrderStatus = ReceiveOrderStatusEnum.Completed.ObjToInt();
receiveOrder.UploadStatus = WhetherEnum.True.ObjToInt();
- //鏇存柊鏀惰揣鍗曚俊鎭�
- _unitOfWorkManage.BeginTran();
BaseDal.UpdateData(receiveOrder);
- _unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -217,21 +215,22 @@
{
return WebResponseContent.Instance.Error($"璇ユ敹璐у崟鏈畬鎴�");
}
+ #region 娉ㄩ噴
+ //List<Dt_CheckOrder> checkOrders = _checkOrderRepository.QueryData(x => x.ReceiveOrderNo == receiveOrder.ReceiveOrderNo);
+ //if (checkOrders.FirstOrDefault(x => x.CheckOrderStatus == CheckOrderStatusEnum.NotCheck.ObjToInt()) != null)
+ //{
+ // return WebResponseContent.Instance.Error($"璇ユ敹璐у崟鏈川妫�瀹屾垚");
+ //}
- List<Dt_CheckOrder> checkOrders = _checkOrderRepository.QueryData(x => x.ReceiveOrderNo == receiveOrder.ReceiveOrderNo);
- if (checkOrders.FirstOrDefault(x => x.CheckOrderStatus == CheckOrderStatusEnum.NotCheck.ObjToInt()) != null)
- {
- return WebResponseContent.Instance.Error($"璇ユ敹璐у崟鏈川妫�瀹屾垚");
- }
-
- if (checkOrders.FirstOrDefault(x => x.AuditStatus != AuditStatusEnum.Agree.ObjToInt()) != null)
- {
- return WebResponseContent.Instance.Error($"璇ユ敹璐у崟璐ㄦ缁撴灉瀹℃壒鏈畬鎴�");
- }
+ //if (checkOrders.FirstOrDefault(x => x.AuditStatus != AuditStatusEnum.Agree.ObjToInt()) != null)
+ //{
+ // return WebResponseContent.Instance.Error($"璇ユ敹璐у崟璐ㄦ缁撴灉瀹℃壒鏈畬鎴�");
+ //}
+ #endregion
Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
{
- InboundOrderNo="TestInboundNo1",//娴嬭瘯
+ InboundOrderNo="TestInboundNo21",//娴嬭瘯
UpperOrderNo = receiveOrder.ReceiveOrderNo,
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
@@ -244,15 +243,17 @@
foreach (var item in receiveOrder.Details)
{
float quantity = item.ReceivedQuantity;
- if (item.IfInspection == WhetherEnum.True.ObjToInt())
- {
- Dt_CheckOrder? checkOrder = checkOrders.FirstOrDefault(x => x.ReceiveOrderNo == receiveOrder.ReceiveOrderNo && x.ReceiveDetailRowNo == item.RowNo);
- if (checkOrder == null)
- {
- return WebResponseContent.Instance.Error($"璐ㄦ鍗曟暟鎹敊璇�");
- }
- quantity = checkOrder.QualifiedQuantity.GetValueOrDefault() + checkOrder.DefectedQuantity.GetValueOrDefault();
- }
+ #region 娉ㄩ噴
+ //if (item.IfInspection == WhetherEnum.True.ObjToInt())
+ //{
+ // Dt_CheckOrder? checkOrder = checkOrders.FirstOrDefault(x => x.ReceiveOrderNo == receiveOrder.ReceiveOrderNo && x.ReceiveDetailRowNo == item.RowNo);
+ // if (checkOrder == null)
+ // {
+ // return WebResponseContent.Instance.Error($"璐ㄦ鍗曟暟鎹敊璇�");
+ // }
+ // quantity = checkOrder.QualifiedQuantity.GetValueOrDefault() + checkOrder.DefectedQuantity.GetValueOrDefault();
+ //}
+ #endregion
Dt_InboundOrderDetail detail = new Dt_InboundOrderDetail()
{
MaterielCode = item.MaterielCode,
@@ -286,7 +287,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌閲囪喘鍗�");
}
- if (purchaseOrder.Details == null || purchaseOrder.Details.Count == 0)
+ if (purchaseOrder.Details.Count == 0)
{
return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟鏄庣粏淇℃伅");
}
@@ -333,24 +334,25 @@
};
rowNo += 1;
receiveOrderDetails.Add(receiveOrderDetail);
-
- if (materielInfo.IsCheck == WhetherEnum.True)
- {
- Dt_CheckOrder checkOrder = _mapper.Map<Dt_CheckOrder>(receiveOrderDetail);
- checkOrder.CheckOrderNo = "TestCheckNo11";//娴嬭瘯
- checkOrder.ReceiveOrderNo = "";
- checkOrder.QualifiedQuantity = receiveOrderDetail.ReceivedQuantity;
- checkOrder.ScrappedQuantity = 0;
- checkOrder.ReturnQuantity = 0;
- checkOrder.DefectedQuantity = 0;
- checkOrder.ReceiveDetailRowNo = rowNo;
- checkOrder.UploadStatus = CheckUploadEnum.UploadNo.ObjToInt();
- checkOrders.Add(checkOrder);
- }
+ #region 娉ㄩ噴
+ //if (materielInfo.IsCheck == WhetherEnum.True)
+ //{
+ // Dt_CheckOrder checkOrder = _mapper.Map<Dt_CheckOrder>(receiveOrderDetail);
+ // checkOrder.CheckOrderNo = "TestCheckNo21";//娴嬭瘯
+ // checkOrder.ReceiveOrderNo = "";
+ // checkOrder.QualifiedQuantity = receiveOrderDetail.ReceivedQuantity;
+ // checkOrder.ScrappedQuantity = 0;
+ // checkOrder.ReturnQuantity = 0;
+ // checkOrder.DefectedQuantity = 0;
+ // checkOrder.ReceiveDetailRowNo = rowNo;
+ // checkOrder.UploadStatus = CheckUploadEnum.UploadNo.ObjToInt();
+ // checkOrders.Add(checkOrder);
+ //}
+ #endregion
}
receiveOrder = new Dt_ReceiveOrder()
{
- ReceiveOrderNo= "TestReceiveOrderNo11",//娴嬭瘯
+ ReceiveOrderNo= "TestReceiveOrderNo21",//娴嬭瘯
ReceiveOrderStatus = ReceiveOrderStatusEnum.Receiving.ObjToInt(),
CustomerId = "",
DeliveryCode = "/",
--
Gitblit v1.9.3