提交

.drone.yml

@@ -19,7 +19,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       - cp java.security /home/build/ezhizao_dms_p2/java.security
 
   - name: build-start
-    image: appleboy/drone-ssh # SSH工具镜像
+    image: appleboy/drone-ssh:1.0.0 # SSH工具镜像
     settings:
       host: 120.46.159.163 # 远程连接地址
       username:

src/main/java/cn/ezhizao/project/business/controller/Mrp10201Controller.java

@@ -168,7 +168,7 @@ public class Mrp10201Controller extends BaseController {
                     }
                     //根据商品版本获取工艺
                     newPlanDetail.setTechnologyVersion(mrp10201.getPrver());
-                    List<BizTechnologicalProcess> technologicalProcessList = technologicalProcessService.query().eq("product_id", newPlanDetail.getProductId()).eq("technology_version", newPlanDetail.getTechnologyVersion()).list();
+                    List<BizTechnologicalProcess> technologicalProcessList = technologicalProcessService.query().eq("product_id", newPlanDetail.getProductId()).eq("technology_version", newPlanDetail.getTechnologyVersion()).eq("is_history", 0).list();
                     if (!technologicalProcessList.isEmpty()){
                         newPlanDetail.setTechnologicalProcessId(technologicalProcessList.get(0).getId());
                     }