2023-05-14-01-bug

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hangerlocation/service/impl/HangerLocationServiceImpl.java

@@ -19,6 +19,8 @@ import org.jeecg.modules.productplan.entity.ZyPlanProcess;
 import org.jeecg.modules.productplan.entity.ZyProductPlan;
 import org.jeecg.modules.productplan.mapper.ZyPlanProcessMapper;
 import org.jeecg.modules.productplan.mapper.ZyProductPlanMapper;
+import org.jeecg.modules.workorder.entity.WorkOrder;
+import org.jeecg.modules.workorder.mapper.WorkOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,6 +44,10 @@ public class HangerLocationServiceImpl extends ServiceImpl<HangerLocationMapper,
     @Autowired
     private HangerLocationMapper hangerLocationMapper;
 
+    //工单
+    @Autowired
+    private WorkOrderMapper workOrderMapper;
+
     //衣架工单绑定
     @Autowired
     private HangerMakerMapper hangerMakerMapper;
@@ -91,8 +97,16 @@ public class HangerLocationServiceImpl extends ServiceImpl<HangerLocationMapper,
         {
             return;
         }
+        //得到所有工单
+        List<WorkOrder> workList=workOrderMapper.selectBatchIds(woList);
+        //
+        List<String> workCodeList=new ArrayList<>();
+        for(WorkOrder wk:workList)
+        {
+            workCodeList.add(wk.getProductCode());
+        }
         QueryWrapper<ZyProductPlan> qwProduct=new QueryWrapper<>();
-        qwProduct.in("product_code",woList);
+        qwProduct.in("product_code",workCodeList);
         List<ZyProductPlan> productPlanList=zyProductPlanMapper.selectList(qwProduct);
         //查找有所传感器
         QueryWrapper<Sensor> qws=new QueryWrapper<>();

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrder.java

@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 工单订单完工
+ * @Description: 工单
  * @Author: jeecg-boot
  * @Date:   2023-01-07
  * @Version: V1.0