仓库-GP12查询条件，描述，PDA入库出库功能调整

ZR.Service/mes/wms/WmOutOrderService.cs

@@ -678,21 +678,36 @@ namespace ZR.Service.mes.wms
                 {
                     return "该箱号未入库！请先入库";
                 }
-
-                // 4.获取出库单号对应的出库计划
-                // List<WmOutOrderPlan> orderPlans = Generate_outorderplan(shipment_num);
-                // 5.配对是否符合出库条件
-                //foreach (var orderPlan in orderPlans)
-                //{
-                //    // 存在匹配条件： 箱标签批次号包含计划短批次号
-                //    if (orderPlan != null && resultionPackage.PatchCode.Contains(orderPlan.Patchcode_short))
-                //    {
-                //        return "ok";
-                //    }
-                //}
+                // 3.2 判断是否是计划中的物料(大概率不执行)
+                bool flag1 = false;
+                List<WmMaterial> materialOutorders = Context.Queryable<WmMaterialOutorder>()
+                    .LeftJoin<WmMaterial>((wmo,wm)=>wmo.FkMaterialId == wm.Id)
+                    .Where(wmo => wmo.FkOutorderId == shipment_num)
+                    .Select((wmo, wm) => new WmMaterial
+                    {
+                        Partnumber = wm.Partnumber
+                    })
+                    .ToList();
+                foreach(WmMaterial materialOption in materialOutorders)
+                {
+                    if (materialOption.Partnumber == resultionPackage.PartNumner)
+                    {
+                        flag1 = true;
+                    }
+                }
+                if (!flag1)
+                {
+                    return "该箱标签物料号不在出库单物料清单内！";
+                }
+                // 4. 判断出库单是否启用出库规则
+                var shipment = Context.Queryable<WmOutOrder>().Where(it => it.ShipmentNum == shipment_num).First();
+                if (shipment.Status == 0)
+                {
+                    return "ok";
+                }
                 // 5.  确保出最早批次
                 string short_path = resultionPackage.PatchCode.Split('_')[0];
-                // 严格规则
+                // 严格规则(出库规则判断)
                 return CheckRuleJudgmentFirstInFirstOut(shipment_num, short_path, parnumber);
                 /*WmOutOrderPlan plan_item = Context.Queryable<WmOutOrderPlan>()
                          .Where(it => it.FkOutOrderId == shipment_num)