Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-07-30 88676143aeceaeec3bd108f9cd609c4f3470ba96

 ´úÂë¹ÜÀí/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)
@@ -82,17 +88,17 @@
                int pageNo = saveModel.MainData["pageNo"].ObjToInt();
                string? orderNo = saveModel.MainData["orderNo"].ToString();
                int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
                List<Dt_OutboundOrder> dt_ReceiveOrders = new List<Dt_OutboundOrder>();
                List<Dt_OutboundOrder> _OutboundOrders = new List<Dt_OutboundOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                    _OutboundOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutOrderStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                    _OutboundOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutOrderStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                }

                content.OK(data: dt_ReceiveOrders);
                content.OK(data: _OutboundOrders);
            }
            catch (Exception ex)
            {
@@ -167,7 +173,9 @@
                    StockId = stockInfo.Id,
                    TaskNum = 0,
                    OrderQuantity = outboundOrderDetail.OrderQuantity,
                    Unit = outboundOrderDetail.Unit
                    Unit = outboundOrderDetail.Unit,
                    ProductionDate = stockInfoDetail.ProductionDate,
                    EffectiveDate = stockInfoDetail.EffectiveDate
                };

                #region ä¿®æ”¹å‡ºåº“单
@@ -204,7 +212,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 +237,7 @@
                    ERPPickItemModel pickItemModel = new ERPPickItemModel()
                    {
                        Lotno = item.BatchNo,
                        Qty = item.AssignQuantity.ObjToInt().ToString(),
                        Qty = item.AssignQuantity.ToString(),
                        Location = WarehouseCode
                    };
                    //获取出库单明细
@@ -259,9 +268,12 @@
                    Deptno = outboundOrder.DepartmentCode,
                    Deptname = outboundOrder.DepartmentName,
                    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
                    Createuser = Createuser,
                    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                };
                //更新发料单号
                outboundOrder.UpFLOrderNo = issueModel.Code;
                BaseDal.UpdateData(outboundOrder);
            }
            catch (Exception ex)
            {
@@ -273,30 +285,38 @@
        {
            try
            {
                Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo && x.OrderStatus < OutOrderStatusEnum.关闭.ObjToInt()).Includes(x => x.Details).OrderBy(x => x.CreateDate).First();
                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == model.MCode);

                if (materielInfo == null)
                {
                    DelOutOrder(oldOutboundOrder);
                    return WebResponseContent.Instance.Error($"未找到该物料信息");
                }

                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == model.WaId);
                if (warehouse == null)
                {
                    DelOutOrder(oldOutboundOrder);
                    return WebResponseContent.Instance.Error($"未找到该仓库信息");
                }

                Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo).Includes(x => x.Details).First();

                if (materielInfo.WarehouseId!= materielInfo.WarehouseId)
                {
                    DelOutOrder(oldOutboundOrder);
                    return WebResponseContent.Instance.Error($"物料{materielInfo}不属于{warehouse.WarehouseName}");
                }
                if (model.Way == 1)
                {
                    if (oldOutboundOrder != null)
                    {
                        if (oldOutboundOrder.Details.FirstOrDefault(x => x.RowNo == Convert.ToInt32(model.RowNo)) != null)
                        {
                            DelOutOrder(oldOutboundOrder);
                            return WebResponseContent.Instance.Error($"该明细行号已存在");
                        }
                        if (oldOutboundOrder.WarehouseId != warehouse.WarehouseId)
                        {
                            DelOutOrder(oldOutboundOrder);
                            return WebResponseContent.Instance.Error($"仓库不一致");
                        }
                        else
@@ -307,6 +327,7 @@
                                BatchNo = model.MLot,
                                MaterielCode = model.MCode,
                                MaterielName = materielInfo.MaterielName,
                                MaterielSpec=materielInfo.MaterielSpec,
                                OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                                OrderQuantity = model.Qty,
                                OrderId = oldOutboundOrder.Id
@@ -321,6 +342,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,
@@ -337,7 +359,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();
                    }
@@ -362,6 +393,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,
@@ -376,6 +408,10 @@
                    {
                        return WebResponseContent.Instance.Error($"未找到该出库单");
                    }
                    _unitOfWorkManage.BeginTran();
                    BaseDal.DeleteData(oldOutboundOrder);
                    _outboundOrderDetailRepository.DeleteData(oldOutboundOrder.Details);
                    _unitOfWorkManage.CommitTran();
                }

                return WebResponseContent.Instance.OK();
@@ -384,6 +420,28 @@
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// è¯¥å•æ®å¤±è´¥è¿›è¡Œåˆ é™¤
        /// </summary>
        /// <returns></returns>
        public void DelOutOrder(Dt_OutboundOrder outboundOrder)
        {
            try
            {
                if (outboundOrder != null && outboundOrder.Details.Count > 0)
                {
                    _unitOfWorkManage.BeginTran();
                    _outboundOrderRepository.DeleteAndMoveIntoHty(outboundOrder, OperateTypeEnum.自动删除);
                    _outboundOrderDetailRepository.DeleteAndMoveIntoHty(outboundOrder.Details, OperateTypeEnum.自动删除);
                    _unitOfWorkManage.CommitTran();
                }
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                throw new Exception(ex.Message);
            }
        }
        //上报出库完成
@@ -448,7 +506,7 @@
                    issueModel = new ERPIssueModel()
                    {
                        UniqueTag = id.ToString(),
                        Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),//测试
                        Code = CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)),
                        WarehouseCode = warehouse.WarehouseCode,
                        Docremark = "",
                        Deptno = outboundOrder.DepartmentCode,
@@ -457,6 +515,9 @@
                        Createuser = outboundOrder.Creater,
                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                    };
                    //更新发料单号
                    outboundOrder.UpFLOrderNo = issueModel.Code;
                    BaseDal.UpdateData(outboundOrder);
                    _invokeERPService.InvokeOutStandardsApi(issueModel);
                }
                else
@@ -518,21 +579,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();
            }
@@ -659,5 +719,29 @@
            }
            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;
        }
    }
}