1

647556386

2026-02-03 ca2d4d7efb253c651b7eb6dc070ec8fae4d39a27

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs

@@ -157,26 +157,33 @@
                    }
                    else
                    {
                        if(item.OrderQuantity > outboundOrderDetail.LockQuantity + outboundOrderDetail.MoveQty)
                        if(item.OrderQuantity < outboundOrderDetail.LockQuantity + outboundOrderDetail.MoveQty)
                        {
                            return WebResponseContent.Instance.Error($"修改的行号{item.lineNo}数量超过了智仓出库锁定数量加上挪料数量，不允许修改");
                        }
                        outboundOrderDetail.lineNo = item.lineNo;
                        outboundOrderDetail.MaterielCode = item.MaterielCode;
                        outboundOrderDetail.SupplyCode = item.SupplyCode;
                        outboundOrderDetail.BatchNo = item.BatchNo;
                        outboundOrderDetail.Unit = item.Unit;
                        outboundOrderDetail.WarehouseCode = item.WarehouseCode;
                        outboundOrderDetail.MoveQty = item.MoveQty;
                        outboundOrderDetail.OrderQuantity = item.OrderQuantity;
                        outboundOrderDetail.BarcodeMoveQty = item.MoveQty;
                        outboundOrderDetail.BarcodeQty = item.OrderQuantity;
                        outboundOrderDetail.BarcodeUnit = item.Unit;
                        var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
                        outboundOrderDetail.Unit = issueoStockResult.Unit;
                        outboundOrderDetail.OrderQuantity = issueoStockResult.Quantity;
                        var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
                        outboundOrderDetail.MoveQty = moveissueoStockResult.Quantity;
                        if(outboundOrderDetail.LockQuantity == 0)
                        {
                            outboundOrderDetail.lineNo = item.lineNo;
                            outboundOrderDetail.MaterielCode = item.MaterielCode;
                            outboundOrderDetail.SupplyCode = item.SupplyCode;
                            outboundOrderDetail.BatchNo = item.BatchNo;
                            outboundOrderDetail.Unit = item.Unit;
                            outboundOrderDetail.WarehouseCode = item.WarehouseCode;
                            outboundOrderDetail.MoveQty = item.MoveQty;
                            outboundOrderDetail.OrderQuantity = item.OrderQuantity;
                            outboundOrderDetail.BarcodeMoveQty = item.MoveQty;
                            outboundOrderDetail.BarcodeQty = item.OrderQuantity;
                            outboundOrderDetail.BarcodeUnit = item.Unit;
                            var issueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeQty);
                            outboundOrderDetail.Unit = issueoStockResult.Unit;
                            outboundOrderDetail.OrderQuantity = issueoStockResult.Quantity;
                            var moveissueoStockResult = await _materialUnitService.ConvertFromToStockAsync(item.MaterielCode, item.BarcodeUnit, item.BarcodeMoveQty);
                            outboundOrderDetail.MoveQty = moveissueoStockResult.Quantity;
                        }
                        else
                        {
                            outboundOrderDetail.OrderQuantity = item.OrderQuantity;
                        }
                        if (materielInfos.Any())
                        {
                            outboundOrderDetail.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";
@@ -198,6 +205,10 @@
                _unitOfWorkManage.BeginTran();
                foreach (var item in deletePurchaseOrderDetails)
                {
                    if(item.LockQuantity > 0)
                    {
                        return WebResponseContent.Instance.Error($"原单据行号{item.lineNo}已经锁定出库，不允许删除，请重新更改数据推送");
                    }
                    // _outboundOrderDetailRepository.DeleteAndMoveIntoHty(item, OperateTypeEnum.自动删除);
                    _outboundOrderDetailRepository.DeleteData(item);
                }
@@ -395,6 +406,40 @@
                            string returnToMESStatus = returnToMESStatusParam.Value.ToString().Trim();
                            sugarQueryable1 = sugarQueryable1.Where(x => x.ReturnToMESStatus.Equals(returnToMESStatus));
                        }

                        var createDateParams = searchParametersList
                    .Where(x => x.Name.Equals("createDate", StringComparison.OrdinalIgnoreCase)
                                && !string.IsNullOrEmpty(x.Value?.ToString()))
                    .ToList();

                        DateTime? minCreateDate = null;
                        DateTime? maxCreateDate = null;

                        foreach (var dateParam in createDateParams)
                        {
                            if (DateTime.TryParse(dateParam.Value.ToString(), out DateTime dateValue))
                            {
                                LinqExpressionType expressionType = dateParam.DisplayType.GetLinqCondition();
                                switch (expressionType)
                                {
                                    case LinqExpressionType.ThanOrEqual:
                                        minCreateDate = dateValue;
                                        break;
                                    case LinqExpressionType.LessThanOrEqual:
                                        maxCreateDate = dateValue;
                                        break;
                                }
                            }
                        }

                        if (minCreateDate.HasValue)
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate >= minCreateDate.Value);
                        }
                        if (maxCreateDate.HasValue)
                        {
                            sugarQueryable1 = sugarQueryable1.Where(x => x.CreateDate <= maxCreateDate.Value);
                        }
                    }
                }
                catch { }