工序接收耐蚀性检测项目生成校验

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/feign/IDisTaskingClient.java

@@ -3,6 +3,7 @@ package org.springblade.desk.produce.feign;
 import org.springblade.core.launch.constant.AppConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 调度任务同步接口
@@ -20,6 +21,7 @@ public interface IDisTaskingClient {
     String RECEIVE_ORDER = API_PREFIX + "/receiveOrder";
     String RB_TRANSFER_ORDER = API_PREFIX + "/rbTransferOrder";
     String UN_BIND_EC = API_PREFIX + "/unBindEc";
+    String SAVE_WORK_ORDER_RUN = API_PREFIX + "/saveWorkOrderRun";
 
 
     /**
@@ -43,4 +45,10 @@ public interface IDisTaskingClient {
 
     @GetMapping(UN_BIND_EC)
     boolean unBindEc();
+
+    /**
+     * 保存生产运行记录
+     */
+    @GetMapping(SAVE_WORK_ORDER_RUN)
+    boolean saveWorkOrderRun(@RequestParam String woId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/feign/DisTaskingClient.java

@@ -6,6 +6,7 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.desk.produce.service.IDisTaskingService;
 import org.springblade.desk.produce.service.IHandoverRecordService;
 import org.springblade.desk.produce.service.IPdaSaveService;
+import org.springblade.desk.produce.service.IWorkOrderService;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -25,6 +26,8 @@ public class DisTaskingClient implements IDisTaskingClient {
 
 	private final IHandoverRecordService handoverRecordService;
 
+	private final IWorkOrderService workOrderService;
+
 	@Override
 	public boolean syncDisTasking() {
 		return disTaskingService.syncDisTasking(false);
@@ -44,4 +47,11 @@ public class DisTaskingClient implements IDisTaskingClient {
 	public boolean unBindEc() {
 		return pdaSaveServiceImpl.unBindEc();
 	}
+
+	@Override
+	public boolean saveWorkOrderRun(String woId) {
+		workOrderService.addPrWorkOrderRun(woId);
+		return true;
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java

@@ -295,5 +295,5 @@ public interface IWorkOrderService extends BaseService<WorkOrder> {
 	/**
 	 * 生产运行记录
 	 */
-	void addPrWorkOrderRun(WorkOrder workOrder);
+	void addPrWorkOrderRun(String woId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -2910,7 +2910,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     }
 
     @Override
-    public void addPrWorkOrderRun(WorkOrder workOrder) {
+    public void addPrWorkOrderRun(String woId) {
+        WorkOrder workOrder = this.getById(woId);
+        if (workOrder == null) {
+            throw new ServiceException("请核实车间订单[" + woId + "]信息是否有误!!!!");
+        }
         WorkPlan prWorkPlan = workPlanService.getById(workOrder.getWpId());
         if (prWorkPlan.getOcId() != null) {
             //产生外协生产进度记录信息