版本更新

wangxinhui

2025-03-31 a6e0ea9ce13e791f3edae4edffeb3be3ccb760be

 ´úÂë¹ÜÀí/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
    }
}