代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs
@@ -194,10 +194,9 @@
                    {
                        //float stockMaxQty = stockInfo.Details.Max(x => x.StockQuantity);
                        //float stockMinQty = stockInfo.Details.Min(x => x.StockQuantity);
                        Dt_StockInfoDetail? addstockInfoDetail = stockInfo.Details?.FirstOrDefault();
                        addstockInfoDetail.Id = 0;
                        addstockInfoDetail.StockQuantity = (takeStockOrderDetail.Qty - takeStockOrderDetail.SysQty);
                        addStockDetails.Add(addstockInfoDetail);
                        Dt_StockInfoDetail addstockInfoDetail = stockInfo.Details.OrderByDescending(x=>x.Id).FirstOrDefault();
                        addstockInfoDetail.StockQuantity = takeStockOrderDetail.Qty;
                        updateStockDetails.Add(addstockInfoDetail);
                    }
                    else if (takeStockOrderDetail.Qty==0) //鐩樹簭
                    {
@@ -266,14 +265,6 @@
                    {
                        _stockInfoDetailRepository.DeleteAndMoveIntoHty(delStockDetails, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
                    }
                    if (addStockDetails.Count>0)
                    {
                        addStockDetails.ForEach(x =>
                        {
                            x.Status = StockStatusEmun.鐩樼偣搴撳瓨瀹屾垚.ObjToInt();
                        });
                        _stockInfoDetailRepository.AddData(addStockDetails);
                    }
                    if (updateStockDetails.Count>0)
                    {
                        updateStockDetails.ForEach(x =>
@@ -285,39 +276,39 @@
                    _takeStockOrderDetailRepository.UpdateData(takeStockOrderDetail);
                    BaseDal.UpdateData(takeStockOrder);
                    //鎻愪氦ERP閫昏緫
                    //if (takeStockOrder.TakeStockStatus== TakeStockStatusEnum.鐩樼偣瀹屾垚.ObjToInt())
                    //{
                    //    ERPTakeStockModel eRPTakeStock = new ERPTakeStockModel()
                    //    {
                    //        Way = 1,
                    //        UniqueTag = takeStockOrder.Id.ToString(),
                    //        Code = takeStockOrder.OrderNo,
                    //        FiscalPeriotime = takeStockOrder.CreateDate.ToString("yyyy-MM-dd"),
                    //        Name=takeStockOrder.OrderNo,
                    //        WarehouseCode= warehouse.WarehouseCode,
                    //        Createuser=takeStockOrder.Creater,
                    //        Createtime= takeStockOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                    //        Details=new List<TakeDetailsItem>()
                    //    };
                    //    foreach (var item in takeStockOrderDetails)
                    //    {
                    //        TakeDetailsItem takeDetailsItem = new TakeDetailsItem()
                    //        {
                    //            MaterialsCode=item.MaterielCode,
                    //            LocationCode=item.LocationCode,
                    //            Lotno=item.BatchNo,
                    //            Sysqty=item.SysQty.ObjToDecimal(),
                    //            Qty=item.Qty.ObjToDecimal()
                    //        };
                    //        eRPTakeStock.Details.Add(takeDetailsItem);
                    //    }
                    //    string response = _invokeERPService.InvokeTakeStockApi(eRPTakeStock);
                    //    ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
                    //    if (erpRequestContent.res != 1)
                    //    {
                    //        throw new Exception("鍚屾ERP澶辫触,閿欒淇℃伅:" + erpRequestContent.Data);
                    //    }
                    //}
                    if (takeStockOrder.TakeStockStatus == TakeStockStatusEnum.鐩樼偣瀹屾垚.ObjToInt())
                    {
                        ERPTakeStockModel eRPTakeStock = new ERPTakeStockModel()
                        {
                            Way = 1,
                            UniqueTag = takeStockOrder.Id.ToString(),
                            Code = takeStockOrder.OrderNo,
                            FiscalPeriotime = takeStockOrder.CreateDate.ToString("yyyy-MM-dd"),
                            Name = takeStockOrder.OrderNo,
                            WarehouseCode = warehouse.WarehouseCode,
                            Createuser = takeStockOrder.Creater,
                            Createtime = takeStockOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                            Details = new List<TakeDetailsItem>()
                        };
                        foreach (var item in takeStockOrderDetails.Where(x=>x.Qty!=x.SysQty))
                        {
                            TakeDetailsItem takeDetailsItem = new TakeDetailsItem()
                            {
                                MaterialsCode = item.MaterielCode,
                                LocationCode = warehouse.WarehouseCode,
                                Lotno = item.BatchNo,
                                Sysqty = item.SysQty.ObjToDecimal(),
                                Qty = item.Qty.ObjToDecimal()
                            };
                            eRPTakeStock.Details.Add(takeDetailsItem);
                        }
                        string response = _invokeERPService.InvokeTakeStockApi(eRPTakeStock);
                        ErpRequestContent erpRequestContent = response.DeserializeObject<ErpRequestContent>();
                        if (erpRequestContent.res != 1)
                        {
                            throw new Exception("鍚屾ERP澶辫触,閿欒淇℃伅:" + erpRequestContent.Data);
                        }
                    }
                    _unitOfWorkManage.CommitTran();
                    content.OK("鐩樼偣鎴愬姛");
                }