优化

yanjinhui

3 天以前 b0ed419ede8bd1829e670891ffe878630ba517e2

优化

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/LKBusiness/CabinOrderServicesLK.cs

@@ -36,6 +36,7 @@
                List<Dt_MaterielInfo> materielInfos = _materielInfoService.Repository.QueryData(x => cabinOrder.Details.Select(x => x.Goods_no).ToList().Contains(x.MaterielCode));
                List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => cabinOrder.Warehouse_no == x.WarehouseCode && cabinOrder.Details.Select(x => x.Goods_no).ToList().Contains(x.MaterielCode));
                List<Dt_Inventory_Batch> inventory_Batches = _inventory_BatchServices.Repository.QueryData(x => cabinOrder.Details.Select(x => x.Goods_no).ToList().Contains(x.MaterielCode));
                List<Dt_MaterielInfo> MaterieInfoBusiness = new List<Dt_MaterielInfo>();
                #region ç›˜ç›ˆå…¥åº“单
                if (cabinOrder.Order_type == "5")
                {
@@ -47,6 +48,14 @@
                        Dt_InventoryInfo inventoryInfo = inventoryInfos.Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo).First();
                        if (orderQty != inventoryInfo.SupplyQuantity)
                            throw new Exception($"盘盈入库数量不一致,上传数量【{orderQty}】,库存盘盈数量【{inventoryInfo.SupplyQuantity}】");
                        var mater = materielInfos.FirstOrDefault(x => x.MaterielCode == detail.productCode);
                        //添加物料信息中的立库业务库存信息
                        if (mater != null)
                        {
                            mater.Business_qty += inventoryInfo.SupplyQuantity;
                            MaterieInfoBusiness.Add(mater);
                        }

                        inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
                        inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
                        inventoryInfo.SupplyQuantity = 0;
@@ -91,6 +100,8 @@
                    _inventory_BatchServices.UpdateData(batchesUp);
                    _cabinOrderDetailServices.UpdateData(cabinOrderDetailsUp);
                    BaseDal.UpdateData(cabinOrder);
                    //添加物料的立库业务基础数据
                    _materielInfoService.UpdateData(MaterieInfoBusiness);
                    _unitOfWorkManage.CommitTran();
                }
                #endregion

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/LKBusiness/DeliveryOrderServicesLK.cs

@@ -28,6 +28,7 @@
                List<Dt_MaterielInfo> materielInfos = _materielInfoService.Repository.QueryData(x => deliveryOrder.Details.Select(x => x.Goods_no).ToList().Contains(x.MaterielCode));
                List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => deliveryOrder.Warehouse_no == x.WarehouseCode && deliveryOrder.Details.Select(x => x.Goods_no).ToList().Contains(x.MaterielCode));
                List<Dt_Inventory_Batch> inventory_Batches = _inventory_BatchServices.Repository.QueryData(x => deliveryOrder.Details.Select(x => x.Goods_no).ToList().Contains(x.MaterielCode));
                List<Dt_MaterielInfo> MaterieInfoBusiness =new List<Dt_MaterielInfo>();
                #region ç›˜äºå‡ºåº“单
                if (deliveryOrder.Out_type == "6")
                {
@@ -41,6 +42,13 @@
                            Dt_InventoryInfo inventoryInfo = inventoryInfos.Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo).First();
                            if (orderQty != Math.Abs(inventoryInfo.SupplyQuantity))
                                throw new Exception($"盘亏出库数量不一致,上传数量【{orderQty}】,库存盘亏数量【{Math.Abs(inventoryInfo.SupplyQuantity)}】");
                            //添加物料信息中的立库业务库存信息
                            var mater = materielInfos.FirstOrDefault(x => x.MaterielCode == detail.productCode);
                            if (mater != null)
                            {
                                mater.Business_qty += inventoryInfo.SupplyQuantity;
                                MaterieInfoBusiness.Add(mater);
                            }
                            inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
                            inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
                            inventoryInfo.SupplyQuantity = 0;
@@ -85,6 +93,8 @@
                        _inventory_BatchServices.UpdateData(batchesUp);
                        _deliveryOrderDetailServices.UpdateData(cabinOrderDetailsUp);
                        BaseDal.UpdateData(deliveryOrder);
                        //添加物料信息中的立库业务库存信息
                        _materielInfoService.UpdateData(MaterieInfoBusiness);
                        _unitOfWorkManage.CommitTran();
                    }
                    catch (Exception ex)