dengjunjie
2024-11-14 c827fe7b0c5b3b444d76ba0d96a2649c764630dd
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs
@@ -44,7 +44,6 @@
        public WebResponseContent PdaAddStockInfo(PdaMaterielGroupDTO pdaMaterielGroupDTO)
        {
            WebResponseContent content = new WebResponseContent();
            WebResponseContent.Instance.OK();
            try
            {
                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.GetMaterielInfo(pdaMaterielGroupDTO.MaterielCode);
@@ -93,7 +92,7 @@
                Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.Where(x => materielInfo.MaterielCode == x.MaterielCode && x.BatchNo == pdaMaterielGroupDTO.BatchNo).FirstOrDefault();//订单详情
                inboundOrderDetail.ReceiptQuantity += pdaMaterielGroupDTO.ReceiptQuantity;
                inboundOrderDetail.ReceiptQuantity++;
                inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
                if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
@@ -261,9 +260,10 @@
            {
                return (false, "物料或批次号有误", materielGroupDTO);
            }
            if (inboundOrderDetail.OrderQuantity - inboundOrderDetail.ReceiptQuantity < materielGroupDTO.ReceiptQuantity)
            if (inboundOrderDetail.OrderQuantity - inboundOrderDetail.ReceiptQuantity < 1)
            {
                return (false, "有物料超出单据数量", materielGroupDTO);
                //return (false, "有物料超出单据数量", materielGroupDTO);
                return (false, "组盘超出单据数量", materielGroupDTO);
            }
            return (true, "成功", inboundOrderDetail);
        }