1

647556386

2026-01-07 71d80b9ed894f471e39d9fbd812809f652284c73

1

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs

@@ -2439,6 +2439,10 @@
                            }
                        }
                    }
                    else
                    {
                        item.WarehouseCode = matchedCode.WarehouseCode;
                    }

                    //鍓╀綑鍏ュ簱鏁伴噺鍗宠櫄鎷熷嚭鍏ュ簱鍓╀綑鍙嚭鏁伴噺
                    decimal outQuantity = item.OrderQuantity - item.ReceiptQuantity;
@@ -2480,7 +2484,6 @@
                    {
                        return WebResponseContent.Instance.Error($"鍑哄簱鍗曟槑缁嗘暟閲忔孩鍑簕matchedCode.OrderQuantity - matchedCode.LockQuantity-matchedCode.NoStockOutQty-matchedCode.MoveQty}");
                    }
                    item.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();

                    outDetails.Add(matchedCode);
                }
@@ -2688,16 +2691,6 @@
                    _inboundOrderService.Db.Updateable(updateInboundOrders.Values.ToList()).ExecuteCommand();
                }

                // 7. 寰幆鍒嗙粍缁撴灉锛岃皟鐢∕ES鍥炰紶鏂规硶锛堟寜鍏ュ簱鍗曞垎缁勫洖浼狅級
                foreach (var kvp in orderIdBarCodeDict)
                {
                    int orderId = kvp.Key;
                    List<string> barCodeList = kvp.Value;
                    //鍏ュ簱鍥炰紶MES
                    NoStockOutBatchInOrderFeedbackToMes(orderId, barCodeList);
                }


                //鍙鍑哄簱鏉＄爜鐨勫嚭搴撳崟鏄庣粏杩涜璁＄畻鍥炰紶
                List<Dt_OutboundOrderDetail> outboundOrderDetail = outboundOrder.Details
                .Where(x => !string.IsNullOrWhiteSpace(x.documentsNO)
@@ -2767,6 +2760,15 @@
                    _outboundOrderService.UpdateData(outboundOrder);
                }
                _unitOfWorkManage.CommitTran();

                // 7. 寰幆鍒嗙粍缁撴灉锛岃皟鐢∕ES鍥炰紶鏂规硶锛堟寜鍏ュ簱鍗曞垎缁勫洖浼狅級
                foreach (var kvp in orderIdBarCodeDict)
                {
                    int orderId = kvp.Key;
                    List<string> barCodeList = kvp.Value;
                    //鍏ュ簱鍥炰紶MES
                    NoStockOutBatchInOrderFeedbackToMes(orderId, barCodeList);
                }
                //鍑哄簱鍥炰紶MES
                _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo);

@@ -2917,7 +2919,7 @@
               }).ToList();
            return groupedData;
        }
        public List<FeedbackInboundDetailsModel> NoStockOutFeedbackInboundDetailsModelDto(List<Dt_InboundOrderDetail> inboundOrderDetails)
        public List<FeedbackInboundDetailsModel> NoStockOutFeedbackInboundDetailsModelDto(List<Dt_InboundOrderDetail> inboundOrderDetails )
        {
            var groupedData = inboundOrderDetails.GroupBy(item => new { item.MaterielCode, item.lineNo, item.BarcodeUnit, item.WarehouseCode })
               .Select(group => new FeedbackInboundDetailsModel