1

dengjunjie

2025-01-18 f4b5b9acda31ad3908bb5cbb2c1910b7fb982bca

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs

@@ -204,38 +204,8 @@
                _unitOfWorkManage.CommitTran();

                #region å‡ºåº“完成上报ERP
                ERPPickItemModel pickItemModel = new ERPPickItemModel()
                {
                    Lotno = model.LotNo,
                    Qty = model.Quantity.ToString(),
                    Location = warehouse.WarehouseCode
                };
                ERPPickModel pickModel = new ERPPickModel()
                {
                    Rowindex = outboundOrderDetail.RowNo,
                    Material = outboundOrderDetail.MaterielCode,
                    Qty = pickItemModel.Qty,
                    Dataitem = new List<ERPPickItemModel> { pickItemModel }
                };
                List<ERPPickModel> eRPPickModels = new List<ERPPickModel>() { pickModel };
                ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
                {
                    Pickcode = outboundOrder.UpperOrderNo,
                    PickList = eRPPickModels
                };
                ERPIssueModel issueModel = new ERPIssueModel()
                {
                    UniqueTag = outboundOrderDetail.OrderId.ToString(),
                    Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
                    WarehouseCode = warehouse.WarehouseCode,
                    Docremark = "",
                    Deptno = outboundOrder.DepartmentCode,
                    Deptname = outboundOrder.DepartmentName,
                    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Createuser = App.User.UserName,
                    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                };
                _invokeERPService.InvokeOutStandardsApi(issueModel);
                if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                    _invokeERPService.InvokeOutStandardsApi(GetERPIssueModel(outboundOrder, warehouse.WarehouseCode));
                #endregion
                content.OK();
            }
@@ -245,6 +215,59 @@
                content.Error(ex.Message);
            }
            return content;
        }
        public ERPIssueModel GetERPIssueModel(Dt_OutboundOrder outboundOrder, string WarehouseCode)
        {
            ERPIssueModel issueModel = new ERPIssueModel();
            try
            {
                List<Dt_OutStockLockInfo> stockLockInfos = _outStockLockInfoService.OutStockLockInfos(outboundOrder.OrderNo);
                List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
                foreach (var item in stockLockInfos)
                {
                    ERPPickItemModel pickItemModel = new ERPPickItemModel()
                    {
                        Lotno = item.BatchNo,
                        Qty = item.AssignQuantity.ObjToInt().ToString(),
                        Location = WarehouseCode
                    };
                    //获取出库单明细
                    Dt_OutboundOrderDetail outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.Id == item.OrderDetailId);
                    ERPPickModel pickModel = new ERPPickModel()
                    {
                        Rowindex = outboundOrderDetail.RowNo,
                        Material = outboundOrderDetail.MaterielCode,
                        Qty = pickItemModel.Qty,
                        Dataitem = new List<ERPPickItemModel> { pickItemModel }
                    };
                    eRPPickModels.Add(pickModel);
                }
                ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
                {
                    Pickcode = outboundOrder.UpperOrderNo,
                    PickList = eRPPickModels
                };
                string Createuser = "";
                if (!string.IsNullOrEmpty(App.User.UserName)) Createuser = App.User.UserName;
                else Createuser = stockLockInfos.FirstOrDefault().Creater;
                issueModel = new ERPIssueModel()
                {
                    UniqueTag = outboundOrder.Id.ToString(),
                    Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
                    WarehouseCode = WarehouseCode,
                    Docremark = "",
                    Deptno = outboundOrder.DepartmentCode,
                    Deptname = outboundOrder.DepartmentName,
                    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
                    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                };
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
            return issueModel;
        }
        public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
        {
@@ -313,7 +336,7 @@
                            DepartmentCode = model.DepartmentCode,
                            DepartmentName = model.DepartmentName,
                            Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail },
                            Remark= model.Node
                            Remark = model.Node

                        };
                        Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
@@ -342,6 +365,7 @@
                        MaterielName = materielInfo.MaterielName,
                        OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                        OrderQuantity = model.Qty,
                        Unit = model.Unit,
                    };

                    _outboundOrderDetailRepository.UpdateData(outboundOrderDetail);
@@ -424,7 +448,7 @@
                    issueModel = new ERPIssueModel()
                    {
                        UniqueTag = id.ToString(),
                        Code = outboundOrder.OrderNo,//测试
                        Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),//测试
                        WarehouseCode = warehouse.WarehouseCode,
                        Docremark = "",
                        Deptno = outboundOrder.DepartmentCode,
@@ -433,53 +457,67 @@
                        Createuser = outboundOrder.Creater,
                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                    };
                    _invokeERPService.InvokeOutStandardsApi(issueModel);
                }
                else
                {
                    List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();

                    //获取出库详情单
                    #region MyRegion
                    foreach (var item in outStockLockInfos)
                    {
                        ERPPickItemModel pickItemModel = new ERPPickItemModel()
                        {
                            Lotno = item.BatchNo,
                            Qty = item.AssignQuantity.ObjToInt().ToString(),
                            Location = warehouse.WarehouseCode
                        };
                        //获取出库单明细
                        Dt_OutboundOrderDetail outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.Id == item.OrderDetailId);
                        ERPPickModel pickModel = new ERPPickModel()
                        {
                            Rowindex = outboundOrderDetail.RowNo,
                            Material = outboundOrderDetail.MaterielCode,
                            Qty = pickItemModel.Qty,
                            Dataitem = new List<ERPPickItemModel> { pickItemModel }
                        };
                        if (item.OrderQuantity == item.AssignQuantity)
                        {
                            item.Status = OutLockStockStatusEnum.出库完成.ObjToInt();
                        }
                        eRPPickModels.Add(pickModel);
                        _OutStockLockInfos.Add(item);
                    }
                    ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
                    {
                        Pickcode = outboundOrder.UpperOrderNo,
                        PickList = eRPPickModels
                    };
                    issueModel = new ERPIssueModel()
                    {
                        UniqueTag = id.ToString(),
                        Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
                        WarehouseCode = warehouse.WarehouseCode,
                        Docremark = "",
                        Deptno = outboundOrder.DepartmentCode,
                        Deptname = outboundOrder.DepartmentName,
                        Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                        Createuser = outStockLockInfos.FirstOrDefault().Creater,
                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                    };
                    #endregion

                    #region MyRegion
                    //List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();

                    ////获取出库详情单
                    //foreach (var item in outStockLockInfos)
                    //{
                    //    ERPPickItemModel pickItemModel = new ERPPickItemModel()
                    //    {
                    //        Lotno = item.BatchNo,
                    //        Qty = item.AssignQuantity.ObjToInt().ToString(),
                    //        Location = warehouse.WarehouseCode
                    //    };
                    //    //获取出库单明细
                    //    Dt_OutboundOrderDetail outboundOrderDetail = outboundOrder.Details.FirstOrDefault(x => x.Id == item.OrderDetailId);
                    //    ERPPickModel pickModel = new ERPPickModel()
                    //    {
                    //        Rowindex = outboundOrderDetail.RowNo,
                    //        Material = outboundOrderDetail.MaterielCode,
                    //        Qty = pickItemModel.Qty,
                    //        Dataitem = new List<ERPPickItemModel> { pickItemModel }
                    //    };
                    //    if (item.OrderQuantity == item.AssignQuantity)
                    //    {
                    //        item.Status = OutLockStockStatusEnum.出库完成.ObjToInt();
                    //    }
                    //    eRPPickModels.Add(pickModel);
                    //    _OutStockLockInfos.Add(item);
                    //}
                    //ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
                    //{
                    //    Pickcode = outboundOrder.UpperOrderNo,
                    //    PickList = eRPPickModels
                    //};
                    //issueModel = new ERPIssueModel()
                    //{
                    //    UniqueTag = id.ToString(),
                    //    Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
                    //    WarehouseCode = warehouse.WarehouseCode,
                    //    Docremark = "",
                    //    Deptno = outboundOrder.DepartmentCode,
                    //    Deptname = outboundOrder.DepartmentName,
                    //    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    //    Createuser = outStockLockInfos.FirstOrDefault().Creater,
                    //    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                    //};
                    #endregion
                }

                if (stockInfos.Count > 0)
@@ -491,7 +529,11 @@
                    _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
                }
                //出库完成上报ERP æµ‹è¯•æ³¨é‡Š
                _invokeERPService.InvokeOutStandardsApi(issueModel);
                if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                {
                    issueModel = GetERPIssueModel(outboundOrder, warehouse.WarehouseCode);
                    _invokeERPService.InvokeOutStandardsApi(issueModel);
                }
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -504,7 +546,7 @@
        {
            lock (lock_code)
            {
                

                string code = string.Empty;
                DateTime dateTime = DateTime.Now;
                DateTime now = DateTime.Now;
@@ -514,7 +556,7 @@
                        throw new ArgumentNullException(nameof(ruleCode));
                    SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
                    {
                        IsAutoCloseConnection = false,
                        IsAutoCloseConnection = true,
                        DbType = DbType.SqlServer,
                        ConnectionString = DBContext.ConnectionString
                    });
@@ -586,5 +628,36 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// æ ¹æ®å‡ºåº“单推送ERP系统
        /// </summary>
        /// <param name="outId"></param>
        /// <param name="WarehouseCode"></param>
        /// <returns></returns>
        public WebResponseContent PushERPOutBound(int outId, string WarehouseCode)
        {
            WebResponseContent content=new WebResponseContent();
            try
            {
                //获取出库单
                Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outId).Includes(x => x.Details).First();
                if (outboundOrder == null)
                {
                    return content.Error("出库单不存在");
                }
                if (outboundOrder.Details.Count!=(outboundOrder.Details.Where(x=>x.OrderDetailStatus==OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count)||outboundOrder.OrderStatus!=OutOrderStatusEnum.出库完成.ObjToInt())
                {
                    return content.Error("该出库单未完成");
                }
                ERPIssueModel issueModel = GetERPIssueModel(outboundOrder, WarehouseCode);
                string response=_invokeERPService.InvokeOutStandardsApi(issueModel);
                return content.OK(response);
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
    }
}