提交

pan

2025-12-03 1a465495340bfea81b1e4d1db130399ccdf58fb4

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

@@ -645,7 +645,7 @@
                    locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                }

                _locationInfoService.Repository.UpdateData(locationInfo);                       
                _locationInfoService.Repository.UpdateData(locationInfo);

                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();

@@ -749,7 +749,7 @@
                        await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                            .SetColumns(it => new Dt_OutboundOrderDetail
                            {
                                LockQuantity = currentLockQty, 
                                LockQuantity = currentLockQty,
                            })
                            .Where(it => it.Id == detailId)
                            .ExecuteCommandAsync();
@@ -831,17 +831,17 @@
                int newStatus = orderDetail.OrderDetailStatus;

                // æ ¹æ®å®žé™…枚举值调整
                // 1. æ£€æŸ¥æ˜¯å¦å·²å®Œæˆï¼ˆå·²å‡ºåº“数量 >= éœ€æ±‚数量）
                //  æ£€æŸ¥æ˜¯å¦å·²å®Œæˆï¼ˆå·²å‡ºåº“数量 >= éœ€æ±‚数量）
                if (orderDetail.OverOutQuantity >= orderDetail.NeedOutQuantity)
                {
                    newStatus = (int)OrderDetailStatusEnum.Over; // å·²å®Œæˆ
                }
                // 2. æ£€æŸ¥æ˜¯å¦æœ‰éƒ¨åˆ†å‡ºåº“或有锁定数量
                //  æ£€æŸ¥æ˜¯å¦æœ‰éƒ¨åˆ†å‡ºåº“或有锁定数量
                else if (orderDetail.OverOutQuantity > 0 || orderDetail.LockQuantity > 0)
                {
                    newStatus = (int)OrderDetailStatusEnum.Outbound; // éƒ¨åˆ†å®Œæˆ/进行中
                }
                // 3. å¦åˆ™ä¸ºæ–°è®¢å•
                // å¦åˆ™ä¸ºæ–°è®¢å•
                else
                {
                    newStatus = (int)OrderDetailStatusEnum.New; // æ–°å»º
@@ -853,7 +853,7 @@
                    await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                        .SetColumns(it => new Dt_OutboundOrderDetail
                        {
                            OrderDetailStatus = newStatus, 
                            OrderDetailStatus = newStatus,
                        })
                        .Where(it => it.Id == orderDetail.Id)
                        .ExecuteCommandAsync();
@@ -940,7 +940,7 @@
                        .SetColumns(x => new Dt_OutboundOrder
                        {
                            OrderStatus = newStatus,
                            Operator = App.User.UserName, 
                            Operator = App.User.UserName,
                        })
                        .Where(x => x.OrderNo == orderNo)
                        .ExecuteCommandAsync();
@@ -1049,52 +1049,55 @@
                                MaterialCode = detail.MaterielCode,
                                LineNo = detail.lineNo,
                                WarehouseCode = detail.WarehouseCode,
                                Qty =0,
                                Qty = 0,
                                Unit = detail.BarcodeUnit,
                                Barcodes = new List<BarcodeInfo>()
                            };
                            foreach (var item in detailLocks)
                            {
                                var barModel = new BarcodeInfo
                                if (item.PickedQty > 0)
                                {
                                    Barcode = item.CurrentBarcode,
                                    SupplyCode = item.SupplyCode,
                                    BatchNo = item.BatchNo,
                                    Unit = detail.BarcodeUnit,
                                    Qty = 0
                                };
                                // å•ä½ä¸ä¸€è‡´æ—¶è½¬æ¢
                                if (detail.BarcodeUnit != detail.Unit)
                                {
                                    var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                    barModel.Unit = convertResult.Unit;
                                    barModel.Qty = convertResult.Quantity;
                                    var barModel = new BarcodeInfo
                                    {
                                        Barcode = item.CurrentBarcode,
                                        SupplyCode = item.SupplyCode,
                                        BatchNo = item.BatchNo,
                                        Unit = detail.BarcodeUnit,
                                        Qty = 0
                                    };
                                    // å•ä½ä¸ä¸€è‡´æ—¶è½¬æ¢
                                    if (detail.BarcodeUnit != detail.Unit)
                                    {
                                        var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                        barModel.Unit = convertResult.Unit;
                                        barModel.Qty = convertResult.Quantity;
                                    }
                                    else
                                    {
                                        barModel.Qty = item.PickedQty;
                                    }
                                    detailModel.Qty += barModel.Qty;
                                    detailModel.Barcodes.Add(barModel);
                                }
                                else
                                {
                                    barModel.Qty = item.PickedQty;
                                }
                                detailModel.Qty += barModel.Qty;
                                detailModel.Barcodes.Add(barModel);


                                allocatefeedmodel.Details.Add(detailModel);
                            }

                            var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
                            if (result != null && result.code == 200)
                            {
                                await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                                       .SetColumns(x => x.ReturnToMESStatus == 1)
                                       .Where(x => x.OrderId == outboundOrder.Id).ExecuteCommandAsync();

                            allocatefeedmodel.Details.Add(detailModel);
                        }

                        var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);
                        if (result != null && result.code == 200)
                        {
                            await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                                   .SetColumns(x => x.ReturnToMESStatus == 1)
                                   .Where(x => x.OrderId == outboundOrder.Id).ExecuteCommandAsync();

                            await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
                                  .SetColumns(x => new Dt_OutboundOrder
                                  {
                                      ReturnToMESStatus = 1,
                                      Operator = App.User.UserName,
                                  }).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
                                await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
                                      .SetColumns(x => new Dt_OutboundOrder
                                      {
                                          ReturnToMESStatus = 1,
                                          Operator = App.User.UserName,
                                      }).Where(x => x.OrderNo == orderNo).ExecuteCommandAsync();
                            }
                        }
                    }
                    else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
@@ -1133,38 +1136,41 @@
                                lineNo = detail.lineNo, // æ³¨æ„ï¼šè¿™é‡Œå¯èƒ½éœ€è¦è°ƒæ•´å­—段名
                                warehouseCode = detail.WarehouseCode,
                                qty = 0,
                                currentDeliveryQty =0,
                                currentDeliveryQty = 0,
                                unit = detail.Unit,
                                barcodes = new List<WIDESEA_DTO.Outbound.BarcodesModel>()
                            };
                            foreach (var item in detailLocks)
                            {
                                var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                                if (item.PickedQty > 0)
                                {
                                    barcode = item.CurrentBarcode,
                                    supplyCode = item.SupplyCode,
                                    batchNo = item.BatchNo,
                                    unit = detail.BarcodeUnit,
                                    qty = item.PickedQty
                                };
                                // å•ä½ä¸ä¸€è‡´æ—¶è½¬æ¢
                                if (detail.BarcodeUnit != detail.Unit)
                                {
                                    var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                    barModel.unit = convertResult.Unit;
                                    barModel.qty = convertResult.Quantity;
                                }
                                else
                                {
                                    barModel.qty = item.PickedQty;
                                }

                                    var barModel = new WIDESEA_DTO.Outbound.BarcodesModel
                                    {
                                        barcode = item.CurrentBarcode,
                                        supplyCode = item.SupplyCode,
                                        batchNo = item.BatchNo,
                                        unit = item.BarcodeUnit,
                                        qty = item.PickedQty
                                    };
                                    // å•ä½ä¸ä¸€è‡´æ—¶è½¬æ¢
                                    if (detail.BarcodeUnit != detail.Unit)
                                    {
                                        var convertResult = await _materialUnitService.ConvertAsync(item.MaterielCode, item.PickedQty, detail.Unit, detail.BarcodeUnit);
                                        barModel.unit = convertResult.Unit;
                                        barModel.qty = convertResult.Quantity;
                                    }
                                    else
                                    {
                                        barModel.qty = item.PickedQty;
                                    }
                                    detailModel.qty += barModel.qty;
                                detailModel.currentDeliveryQty += barModel.qty;
                                detailModel.barcodes.Add(barModel);
                                    detailModel.currentDeliveryQty += barModel.qty;
                                    detailModel.barcodes.Add(barModel);
                                }
                            }
                            feedmodel.details.Add(detailModel);
                        }

                        var result = await _invokeMESService.FeedbackOutbound(feedmodel);
                        if (result != null && result.code == 200)
                        {