From a6e0ea9ce13e791f3edae4edffeb3be3ccb760be Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 31 三月 2025 02:14:59 +0800
Subject: [PATCH] 版本更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 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 0477465..80a732e 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"
@@ -166,13 +166,17 @@
//鏀惰揣鎺ㄩ�佽嚦ER
string response = _invokeERPService.InvokeMatReceiveApi(receiveModel);
ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();
- if (requestContent.res == 1)
+ if (requestContent.res != 1)
{
- receiveOrder.UploadStatus = WhetherEnum.True.ObjToInt();
+ return WebResponseContent.Instance.Error($"{requestContent.Data}");
}
+ receiveOrder.UploadStatus = WhetherEnum.True.ObjToInt();
BaseDal.UpdateData(receiveOrder);
- //鍒涘缓鍏ュ簱鍗�
- CreateInboundOrder(orderId);
+ if (receiveOrder.Details.FirstOrDefault(x=>x.IfInspection==WhetherEnum.True.ObjToInt())==null)
+ {
+ //鍒涘缓鍏ュ簱鍗� todo:鏄庣粏閮芥槸涓嶆楠岃嚜鍔ㄥ垱寤哄叆搴撳崟
+ CreateInboundOrder(orderId);
+ }
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -240,16 +244,20 @@
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.Result != CheckAcceptEnum.Accept.ToString()) != null)
+ //{
+ // return WebResponseContent.Instance.Error($"鏀惰揣鏄庣粏涓瓨鏈夎川妫�鏈�氳繃");
+ //}
#endregion
Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
@@ -267,15 +275,15 @@
{
float quantity = item.ReceivedQuantity;
#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();
- ////}
+ //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()
{
@@ -302,7 +310,7 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
+ #region 娴嬭瘯
public WebResponseContent ReceiveAllOrder(int purchaseOrderId, string lotNo)
{
try
@@ -467,5 +475,6 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ #endregion
}
}
--
Gitblit v1.9.3