1

dengjunjie

2025-02-20 37ea017aad42d0682d068b65e82aa62ea9e2c1ea

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs

@@ -35,6 +35,10 @@
        {
            return BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).First(x => x.OrderNo == inboundOrderNo);
        }
        public bool UpdateDataWithDetail(Dt_InboundOrder inboundOrder)
        {
            return Db.UpdateNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
        }
        /// <summary>
        /// PDA组盘
        /// å•ç§ç‰©æ–™ç»„盘
@@ -44,7 +48,6 @@
        public WebResponseContent PdaAddStockInfo(PdaMaterielGroupDTO pdaMaterielGroupDTO)
        {
            WebResponseContent content = new WebResponseContent();
            WebResponseContent.Instance.OK();
            try
            {
                Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.GetMaterielInfo(pdaMaterielGroupDTO.MaterielCode);
@@ -89,11 +92,11 @@
                    stockInfoDetail.StockQuantity += pdaMaterielGroupDTO.ReceiptQuantity;
                    stockInfoDetail.SerialNumber = $"{inboundOrder.OrderNo} | {materielInfo.MaterielCode} | {pdaMaterielGroupDTO.BatchNo} | {(int)stockInfoDetail.StockQuantity}";
                }
                 


                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)
@@ -238,6 +241,10 @@
            {
                return (false, "已上架的托盘不能再次组盘", materielGroupDTO);
            }
            if (stockInfo != null)
            {
                return (false, "已组盘的托盘不能再次组盘", materielGroupDTO);
            }
            if (materielInfo == null)
            {
                return (false, "有物料信息未录入，请录入物料信息", materielGroupDTO);
@@ -261,9 +268,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);
        }