wangxinhui
2025-03-15 e974c93c984188524f15964529203db25ede3170
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs
@@ -71,7 +71,13 @@
                    return WebResponseContent.Instance.Error($"{upperOrderNo}领料单号已存在");
                }
            }
            saveModel.DetailData[0].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());
            if (saveModel.DetailData.Count>0)
            {
                for (int i = 0; i < saveModel.DetailData.Count; i++)
                {
                    saveModel.DetailData[i].Add("orderDetailStatus", OrderDetailStatusEnum.New.ObjToInt());
                }
            }
            return base.AddData(saveModel);
        }
        public WebResponseContent GetOutboundOrders(SaveModel saveModel)
@@ -204,7 +210,8 @@
                _unitOfWorkManage.CommitTran();
                #region å‡ºåº“完成上报ERP
                if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                //生产领料,研发领料,标准领料,推送ERP出库
                if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt() && outboundOrder.OrderType==OutOrderTypeEnum.Issue.ObjToInt())
                    _invokeERPService.InvokeOutStandardsApi(GetERPIssueModel(outboundOrder, warehouse.WarehouseCode));
                #endregion
                content.OK();
@@ -228,7 +235,7 @@
                    ERPPickItemModel pickItemModel = new ERPPickItemModel()
                    {
                        Lotno = item.BatchNo,
                        Qty = item.AssignQuantity.ObjToInt().ToString(),
                        Qty = item.AssignQuantity.ToString(),
                        Location = WarehouseCode
                    };
                    //获取出库单明细
@@ -247,6 +254,9 @@
                    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(),
@@ -256,9 +266,12 @@
                    Deptno = outboundOrder.DepartmentCode,
                    Deptname = outboundOrder.DepartmentName,
                    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Createuser = App.User.UserName ?? stockLockInfos.FirstOrDefault().Creater ?? "admin",
                    Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
                    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                };
                //更新发料单号
                outboundOrder.UpFLOrderNo = issueModel.Code;
                BaseDal.UpdateData(outboundOrder);
            }
            catch (Exception ex)
            {
@@ -304,6 +317,7 @@
                                BatchNo = model.MLot,
                                MaterielCode = model.MCode,
                                MaterielName = materielInfo.MaterielName,
                                MaterielSpec=materielInfo.MaterielSpec,
                                OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                                OrderQuantity = model.Qty,
                                OrderId = oldOutboundOrder.Id
@@ -318,6 +332,7 @@
                            RowNo = Convert.ToInt32(model.RowNo),
                            BatchNo = model.MLot,
                            MaterielCode = model.MCode,
                            MaterielSpec = materielInfo.MaterielSpec,
                            MaterielName = materielInfo.MaterielName,
                            OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                            OrderQuantity = model.Qty,
@@ -334,7 +349,16 @@
                            DepartmentName = model.DepartmentName,
                            Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail },
                            Remark = model.Node
                        };
                        outboundOrder.OrderType = model.OType switch
                        {
                            1 or 2 or 3=> OutOrderTypeEnum.Issue.ObjToInt(),
                            4=>OutOrderTypeEnum.Quality.ObjToInt(),
                            5=>OutOrderTypeEnum.Allocate.ObjToInt(),
                            6=>OutOrderTypeEnum.MaintenanceIssue.ObjToInt(),
                            7=>OutOrderTypeEnum.SaleOut.ObjToInt(),
                            8=>OutOrderTypeEnum.Rework.ObjToInt(),
                            _=>0
                        };
                        Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
                    }
@@ -359,6 +383,7 @@
                        RowNo = Convert.ToInt32(model.RowNo),
                        BatchNo = model.MLot,
                        MaterielCode = model.MCode,
                        MaterielSpec = materielInfo.MaterielSpec,
                        MaterielName = materielInfo.MaterielName,
                        OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                        OrderQuantity = model.Qty,
@@ -373,6 +398,10 @@
                    {
                        return WebResponseContent.Instance.Error($"未找到该出库单");
                    }
                    _unitOfWorkManage.BeginTran();
                    BaseDal.DeleteData(oldOutboundOrder);
                    _outboundOrderDetailRepository.DeleteData(oldOutboundOrder.Details);
                    _unitOfWorkManage.CommitTran();
                }
                return WebResponseContent.Instance.OK();
@@ -445,7 +474,7 @@
                    issueModel = new ERPIssueModel()
                    {
                        UniqueTag = id.ToString(),
                        Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),//测试
                        Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
                        WarehouseCode = warehouse.WarehouseCode,
                        Docremark = "",
                        Deptno = outboundOrder.DepartmentCode,
@@ -454,6 +483,9 @@
                        Createuser = outboundOrder.Creater,
                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                    };
                    //更新发料单号
                    outboundOrder.UpFLOrderNo = issueModel.Code;
                    BaseDal.UpdateData(outboundOrder);
                    _invokeERPService.InvokeOutStandardsApi(issueModel);
                }
                else
@@ -515,21 +547,20 @@
                    //    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                    //};
                    #endregion
                }
                if (stockInfos.Count > 0)
                {
                    _stockService.StockInfoService.Repository.UpdateData(stockInfos);
                }
                else
                {
                    _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
                }
                //出库完成上报ERP æµ‹è¯•注释
                if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                {
                    issueModel = GetERPIssueModel(outboundOrder, warehouse.WarehouseCode);
                    _invokeERPService.InvokeOutStandardsApi(issueModel);
                    if (stockInfos.Count > 0)
                    {
                        _stockService.StockInfoService.Repository.UpdateData(stockInfos);
                    }
                    else
                    {
                        _outStockLockInfoService.Repository.UpdateData(_OutStockLockInfos);
                    }
                    //出库完成上报ERP æµ‹è¯•注释
                    if (outboundOrder.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt())
                    {
                        issueModel = GetERPIssueModel(outboundOrder, warehouse.WarehouseCode);
                        _invokeERPService.InvokeOutStandardsApi(issueModel);
                    }
                }
                return WebResponseContent.Instance.OK();
            }
@@ -553,7 +584,7 @@
                        throw new ArgumentNullException(nameof(ruleCode));
                    SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
                    {
                        IsAutoCloseConnection = false,
                        IsAutoCloseConnection = true,
                        DbType = DbType.SqlServer,
                        ConnectionString = DBContext.ConnectionString
                    });
@@ -625,5 +656,60 @@
                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;
        }
        public WebResponseContent OutUpOrderGetFLOrder()
        {
            WebResponseContent  content = new WebResponseContent();
            try
            {
                //获取出库单
                List<Dt_OutboundOrder> outboundOrders = BaseDal.QueryData(x => x.OrderStatus == OutOrderStatusEnum.出库完成.ObjToInt() && x.UpFLOrderNo == null);
                List<Sys_Log> logs = BaseDal.Db.Queryable<Sys_Log>().Where(x => x.RequestParam.Contains("领料出库通知单") &&  x.Id > 14606).ToList();
                foreach (var item in outboundOrders)
                {
                    Sys_Log? log = logs.FirstOrDefault(x=>x.RequestParam.Contains(item.UpperOrderNo));
                    if (log == null) { continue; }
                    ERPBaseModel <ERPIssueModel>  baseModel= log.RequestParam.DeserializeObject<ERPBaseModel<ERPIssueModel>>();
                    item.UpFLOrderNo = baseModel.Data.Code;
                }
                BaseDal.UpdateData(outboundOrders);
                content.OK();
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
    }
}