退料，调拨优化等

wangxinhui

2025-02-17 a0beecb00c6c0c8247b0c9b29c440369f583eb40

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

@@ -210,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();
@@ -268,6 +269,9 @@
                    Createuser = string.IsNullOrEmpty(Createuser) ? Createuser : "admin",
                    Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                };
                //更新发料单号
                outboundOrder.UpFLOrderNo = issueModel.Code;
                BaseDal.UpdateData(outboundOrder);
            }
            catch (Exception ex)
            {
@@ -313,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
@@ -327,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,
@@ -343,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();
                    }
@@ -368,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,
@@ -382,6 +398,10 @@
                    {
                        return WebResponseContent.Instance.Error($"未找到该出库单");
                    }
                    _unitOfWorkManage.BeginTran();
                    BaseDal.DeleteData(oldOutboundOrder);
                    _outboundOrderDetailRepository.DeleteData(oldOutboundOrder.Details);
                    _unitOfWorkManage.CommitTran();
                }

                return WebResponseContent.Instance.OK();
@@ -463,6 +483,9 @@
                        Createuser = outboundOrder.Creater,
                        Issitem = new List<ERPIssueItemModel>() { issueItemModel },
                    };
                    //更新发料单号
                    outboundOrder.UpFLOrderNo = issueModel.Code;
                    BaseDal.UpdateData(outboundOrder);
                    _invokeERPService.InvokeOutStandardsApi(issueModel);
                }
                else
@@ -524,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();
            }