feat:处理加弹排产，渲染表单的bug

zkqy-admin/src/main/java/com/zkqy/web/controller/homepagestatistics/StatisticsController.java

@@ -176,9 +176,6 @@ public class StatisticsController {
             return AjaxResult.success(list);
         }
 
-
-
-
     }
 
 

zkqy-business/src/main/java/com/zkqy/business/controller/CommonBtnController.java

@@ -9,6 +9,7 @@ import com.zkqy.business.entity.DragTableBtn;
 import com.zkqy.business.service.IDragFormService;
 import com.zkqy.business.service.IDragTableBtnService;
 import com.zkqy.business.service.IDragTableGroupService;
+import com.zkqy.business.service.impl.DragTableBtnServiceImpl;
 import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
@@ -74,6 +75,9 @@ public class CommonBtnController extends BaseController {
     @Autowired  // 节点
     private BpmExecuteNodeFormMapper executeNodeFormMapper;
 
+    @Autowired
+    private DragTableBtnServiceImpl dragTableBtnService;
+
     /**
      * 处理按钮通用接口（新增、修改、删除...）
      * 判断什么类型走什么接口: visible  false代表弹窗未开启时走回显表单模板及数据信息接口；true代表弹窗开启时走保存数据接口
@@ -131,7 +135,15 @@ public class CommonBtnController extends BaseController {
                 return success(getFormGroupInfo(commonEntity, dragTableBtn));
             } else {
                 String sqlKey = commonEntity.getBasicMap().get("sqlKey").toString();
-                return success(dragFormService.selectDragFormBySqlKey(sqlKey));
+                DragForm dragForm = dragFormService.selectDragFormBySqlKey(sqlKey);
+                if(dragForm != null){
+                    return success(dragFormService.selectDragFormBySqlKey(sqlKey));
+                }else {
+                    String btnKey = commonEntity.getBasicMap().get("btnKey").toString();
+                    DragTableBtn dragTableBtnPojo = dragTableBtnService.selectDragTableBtnByBtnKey(btnKey);
+//                    dragTableBtnPojo.getBtnFormKey();
+                    return success(dragFormService.selectDragFormByformKey(dragTableBtnPojo.getBtnFormKey()));
+                }
             }
         } else {
             return warn("暂不支持该操作！");

zkqy-custom-business/src/main/java/com/zkqy/business/controller/DetailsOfTheRefuelingPlanController.java

@@ -101,16 +101,19 @@ public class DetailsOfTheRefuelingPlanController extends BaseController {
             DetailsOfTheRefuelingPlan detailsOfTheRefuelingPlanSelect=new DetailsOfTheRefuelingPlan();
             detailsOfTheRefuelingPlanSelect.setMachineId(id);
             detailsOfTheRefuelingPlanSelect.setProductType("A面");
+            detailsOfTheRefuelingPlanSelect.setPlanStatus("1");
             List<DetailsOfTheRefuelingPlan> detailsOfTheRefuelingPlans = detailsOfTheRefuelingPlanService.selectDetailsOfTheRefuelingPlanList(detailsOfTheRefuelingPlanSelect);
-            List<DetailsOfTheRefuelingPlan> collect = detailsOfTheRefuelingPlans.stream().filter(item -> item.getPlanStatus().equals("1")).collect(Collectors.toList());
-            if(collect.size()>0){
+            //有没有上机的，有的话把他改成停机
+            if(detailsOfTheRefuelingPlans.size()>0){
                 DetailsOfTheRefuelingPlan detailsOfTheRefuelingPlanUpdate=new DetailsOfTheRefuelingPlan();
                 detailsOfTheRefuelingPlanUpdate.setPlanStatus("2");
                 detailsOfTheRefuelingPlanUpdate.setMachineId(id);
                 detailsOfTheRefuelingPlanUpdate.setProductType("A面");
+                detailsOfTheRefuelingPlanUpdate.setPlanStatusOld("1");
                 detailsOfTheRefuelingPlanMapper.updateDetailsOfTheRefuelingPlanByMachineIdAndProductType(detailsOfTheRefuelingPlanUpdate);
             }
         }else {
+            //就是把所有停机的变成待上机
             DetailsOfTheRefuelingPlan detailsOfTheRefuelingPlanConditions=new DetailsOfTheRefuelingPlan();
             detailsOfTheRefuelingPlanConditions.setMachineId(id);
             detailsOfTheRefuelingPlanConditions.setPlanStatus("2");
@@ -120,6 +123,7 @@ public class DetailsOfTheRefuelingPlanController extends BaseController {
                 detailsOfTheRefuelingPlanUpdate.setMachineId(id);
                 detailsOfTheRefuelingPlanUpdate.setPlanStatus("1");
                 detailsOfTheRefuelingPlanUpdate.setProductType("A面");
+                detailsOfTheRefuelingPlanUpdate.setPlanStatusOld("2");
                 detailsOfTheRefuelingPlanMapper.updateDetailsOfTheRefuelingPlanByMachineIdAndProductType(detailsOfTheRefuelingPlanUpdate);
             }
         }
@@ -142,6 +146,7 @@ public class DetailsOfTheRefuelingPlanController extends BaseController {
                 detailsOfTheRefuelingPlanUpdate.setPlanStatus("2");
                 detailsOfTheRefuelingPlanUpdate.setMachineId(id);
                 detailsOfTheRefuelingPlanUpdate.setProductType("B面");
+                detailsOfTheRefuelingPlanUpdate.setPlanStatusOld("1");
                 detailsOfTheRefuelingPlanMapper.updateDetailsOfTheRefuelingPlanByMachineIdAndProductType(detailsOfTheRefuelingPlanUpdate);
             }
         }else {
@@ -154,6 +159,7 @@ public class DetailsOfTheRefuelingPlanController extends BaseController {
                 detailsOfTheRefuelingPlanUpdate.setMachineId(id);
                 detailsOfTheRefuelingPlanUpdate.setPlanStatus("1");
                 detailsOfTheRefuelingPlanUpdate.setProductType("B面");
+                detailsOfTheRefuelingPlanUpdate.setPlanStatusOld("2");
                 detailsOfTheRefuelingPlanMapper.updateDetailsOfTheRefuelingPlanByMachineIdAndProductType(detailsOfTheRefuelingPlanUpdate);
             }
         }

zkqy-custom-business/src/main/java/com/zkqy/business/domain/DetailsOfTheRefuelingPlan.java

@@ -72,6 +72,10 @@ public class DetailsOfTheRefuelingPlan extends BaseEntity
     @Excel(name = "计划状态")
     private String planStatus;
 
+    @Excel(name = "计划状态")
+    private String planStatusOld;
+
+
 
     /** 计划状态 */
     @Excel(name = "数量")
@@ -81,7 +85,13 @@ public class DetailsOfTheRefuelingPlan extends BaseEntity
     @Excel(name = "产品类型")
     private String productType;
 
+    public String getPlanStatusOld() {
+        return planStatusOld;
+    }
 
+    public void setPlanStatusOld(String planStatusOld) {
+        this.planStatusOld = planStatusOld;
+    }
     public String getProductId() {
         return productId;
     }

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/AmmunitionPlanInformationIntermediateTableServiceImpl.java

@@ -164,6 +164,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
             detailsOfTheRefuelingPlan4.setProductType("A面");
             List<DetailsOfTheRefuelingPlan> detailsOfTheRefuelingPlans4 = detailsOfTheRefuelingPlanMapper.selectDetailsOfTheRefuelingPlanList(detailsOfTheRefuelingPlan4);
             if(detailsOfTheRefuelingPlans4.size()>0){
+                //所有停机的数据不好含字段为停机的数据
                 List<DetailsOfTheRefuelingPlan> tjSize = detailsOfTheRefuelingPlans4.stream().filter(item1 -> !item1.getTimestampRandomCode().equals("停机")).collect(Collectors.toList());
                 //不需要假数据来顶替，因为真实数据有停机的出现
                 if(tjSize.size()>0){
@@ -181,7 +182,8 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                         list.add(rs1);
                     });
                 }
-                if(tjSize.size()==0){
+                //如果
+                if(tjSize.size()==0&&AList.size()==0){
                     //假数据停机
                     detailsOfTheRefuelingPlans4.stream().forEach(item1->{
                         //拿到了某个车间的所有产线
@@ -197,7 +199,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                 }
             }
             //A面有没有待机的
-            if(detailsOfTheRefuelingPlans2.size()>0&&AList.size()<=0){
+            if(detailsOfTheRefuelingPlans2.size()>0&&AList.size()<=0&&detailsOfTheRefuelingPlans4.size()<=0){
                 AmmunitionPlanInformationIntermediateTableRVo rs1=new AmmunitionPlanInformationIntermediateTableRVo();
                 rs1.setMachineId(item.getProductionLineNo());//产线号
                 String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
@@ -255,7 +257,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                     });
             }
             //B待机
-            if(detailsOfTheRefuelingPlans3.size()>0&&BList.size()<=0){
+            if(detailsOfTheRefuelingPlans3.size()>0&&BList.size()<=0&&detailsOfTheRefuelingPlans5.size()<=0){
                 AmmunitionPlanInformationIntermediateTableRVo rs1=new AmmunitionPlanInformationIntermediateTableRVo();
                 rs1.setMachineId(item.getProductionLineNo());//产线号
                 String collect = detailsOfTheRefuelingPlans3.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));

zkqy-custom-business/src/main/resources/mapper/business/DetailsOfTheRefuelingPlanMapper.xml

@@ -178,7 +178,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salesmanId != null  and salesmanId != ''">`salesman_id`= #{salesmanId},</if>
         </trim>
         where machine_id = #{machineId} and productType=#{productType}
+        <if test="planStatusOld != null  and planStatusOld != ''">
+            and plan_status=#{planStatusOld}
+        </if>
     </update>
+
     <delete id="deleteDetailsOfTheRefuelingPlanById" parameterType="Long">
         delete from {DBNAME}.details_of_the_refueling_plan where id = #{id}
     </delete>