1

647556386

2025-12-19 13696e4f5535623ec5fc0b6f37310e78c2c383c5

1

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/DirectOutbound.vue

@@ -9,7 +9,7 @@
                    </el-select>
                </el-form-item>
            </el-form>
            <el-form ref="form" :model="form" label-width="90px" v-if="isBatch === 1" v-show="this.outboundQuantity>0">
            <el-form ref="form" :model="form" label-width="90px" v-if="isBatch === 1" v-show="this.outboundQuantity>1">
                <el-form-item label="出库数量:">
                    <el-input-number v-model="outboundQuantity" :controls="true" placeholder="请选择出库数量"
                        style="width: 100%;"></el-input-number>

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue

@@ -350,7 +350,7 @@
      const keys = this.selection.map((item) => item.id);
      const requestParams = {
        detailIds: keys,
        outboundQuantity: this.selection.length>1?0: this.selection[0].orderQuantity-this.selection[0].lockQuantity,
        outboundQuantity: this.selection.length>1?1: this.selection[0].orderQuantity-this.selection[0].lockQuantity,
        operator: "",
        orderNo: this.row.orderNo,
        isBatch: this.isBatch

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

@@ -577,73 +577,32 @@

        public override PageGridData<Dt_OutboundOrderDetail> GetPageData(PageDataOptions options)
        {
            return base.GetPageData(options);
            //var  pageGridData = base.GetPageData(options);

            //ISugarQueryable<Dt_OutboundOrderDetail> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>();
            //if (!string.IsNullOrEmpty(options.Wheres))
            //{
            ISugarQueryable<Dt_OutboundOrderDetail> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>();
            if (!string.IsNullOrEmpty(options.Wheres))
            {

            //    List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
            //    int totalCount = 0;
            //    if (searchParametersList.Count > 0)
            //    {
            //        {
            //            SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrderDetail.OrderId).FirstLetterToLower());
            //            if (searchParameters != null)
            //            {
            //                Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == searchParameters.Value.ObjToInt());
            //                if (outboundOrder != null)
            //                {
            //                    if (outboundOrder.IsBatch == 0)
            //                    {
            //                        sugarQueryable1 = sugarQueryable1.Where(x => x.OrderId == searchParameters.Value.ObjToInt());
            //                        var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
            //                        return new PageGridData<Dt_OutboundOrderDetail>(totalCount, dataList);
            //                    }
            //                    else
            //                    {
            //                        sugarQueryable1 = sugarQueryable1.Where(x => x.OrderId == searchParameters.Value.ObjToInt());
            //                        sugarQueryable1.GroupBy(x => new { x.MaterielCode, x.MaterielName, x.BatchNo, x.SupplyCode, x.WarehouseCode }).Select(s => new Dt_OutboundOrderDetail
            //                        {
            //                            WarehouseCode = s.WarehouseCode,
            //                            SupplyCode = s.SupplyCode,
            //                            BatchNo = s.BatchNo,
            //                            MaterielName = s.MaterielName,
            //                            MaterielCode = s.MaterielCode,
            //                            AllocatedQuantity = SqlFunc.AggregateSum(s.AllocatedQuantity),
            //                            OrderQuantity = SqlFunc.AggregateSum(s.OrderQuantity),
            //                            PickedQty = SqlFunc.AggregateSum(s.PickedQty),
            //                            OverOutQuantity = SqlFunc.AggregateSum(s.OverOutQuantity),
            //                            MoveQty = SqlFunc.AggregateSum(s.MoveQty),
            //                            NoStockOutQty = SqlFunc.AggregateSum(s.NoStockOutQty),
            //                            LockQuantity = SqlFunc.AggregateSum(s.LockQuantity),
            //                            BarcodeMoveQty = SqlFunc.AggregateSum(s.BarcodeMoveQty),
            //                            BarcodeQty =SqlFunc.AggregateMin( s.BarcodeQty),
            //                            BarcodeUnit = SqlFunc.AggregateMin(s.BarcodeUnit),
            //                            BatchAllocateStatus = SqlFunc.AggregateMin(s.BatchAllocateStatus),
            //                            CreateDate = SqlFunc.AggregateMin(s.CreateDate),
            //                            Creater = SqlFunc.AggregateMin(s.Creater),
            //                            documentsNO = SqlFunc.AggregateMin(s.documentsNO),
            //                            Id = SqlFunc.AggregateMin(s.Id),
            //                            lineNo = SqlFunc.AggregateMin(s.lineNo),
            //                            Modifier = SqlFunc.AggregateMin(s.Modifier),
            //                            ModifyDate = SqlFunc.AggregateMin(s.ModifyDate),
            //                            OrderDetailStatus = SqlFunc.AggregateMin(s.OrderDetailStatus),
            //                            OrderId = SqlFunc.AggregateMin(s.OrderId),
            //                            Remark = SqlFunc.AggregateMin(s.Remark),
            //                            ReturnJsonData = SqlFunc.AggregateMin(s.ReturnJsonData),
            //                            ReturnToMESStatus = SqlFunc.AggregateMin(s.ReturnToMESStatus),
            //                            RowNo = SqlFunc.AggregateMin(s.RowNo),
            //                            Unit = SqlFunc.AggregateMin(s.Unit)
            //                        });
            //                        var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
            //                        return new PageGridData<Dt_OutboundOrderDetail>(totalCount, dataList);
            //                    }
            //                }
            //            }
            //        }
            //    }
            //}
                List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                int totalCount = 0;
                if (searchParametersList.Count > 0)
                {
                    {
                        SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrderDetail.OrderId).FirstLetterToLower());
                        if (searchParameters != null)
                        {
                            Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == searchParameters.Value.ObjToInt());
                            if (outboundOrder != null)
                            {
                                sugarQueryable1 = sugarQueryable1.Where(x => x.OrderId == searchParameters.Value.ObjToInt());
                                var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
                                return new PageGridData<Dt_OutboundOrderDetail>(totalCount, dataList);
                            }
                        }
                    }
                }
            }

            return new PageGridData<Dt_OutboundOrderDetail>();
        }


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

@@ -277,7 +277,7 @@
                result.OutboundOrder = outboundOrder;
                result.SelectedDetails = selectedDetails;

                if (outboundOrder.IsBatch == 0 && request.DetailIds.Count > 1)
                if (outboundOrder.IsBatch == 0 || request.DetailIds.Count > 1)
                {
                    // å¤šæ˜Žç»†å‡ºåº“：按物料分组处理
                    result.MaterielCalculations = CalcMaterielOutboundQuantities(outboundOrder, selectedDetails.ToList());