楚江ERP-1、订货单变更记录增加办事处名称模糊搜索；2、订货单变更确认接口开发

@@ -139,6 +139,17 @@ public class OrderChangeRecordController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
+     * 确认变更
+     */
+    @ApiOperation("确认变更")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @DeleteMapping("/confirm")
+    public InvokeResult<Void> confirm(@NotBlank(message = "id不能为空！") String id) {
+        orderChangeRecordService.confirm(id);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 规格变更打印
      * 规格变更打印
      * @param id            主键ID
      * @param id            主键ID
      * @param response      响应体
      * @param response      响应体

@@ -235,7 +235,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         // 重新发起流程
         // 重新发起流程
         Boolean output = data.getOutput();
         Boolean output = data.getOutput();
         if (BooleanUtils.isTrue(output)) {
         if (BooleanUtils.isTrue(output)) {
-            flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", vo.getId(), BPM_FLAG, data);
+            flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", vo.getId(), "SPEC_CHANGE_CONFIRM", data);
         } else {
         } else {
             flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data);
             flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data);
         }
         }
@@ -309,4 +309,18 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         // 消息通知
         // 消息通知
         messageHandler.sendMsg(record.getCreateById(), Collections.singletonList("jybjhy"), "SPEC_CHANGE_SUBMIT", null);
         messageHandler.sendMsg(record.getCreateById(), Collections.singletonList("jybjhy"), "SPEC_CHANGE_SUBMIT", null);
     }
     }
+
+    @Override
+    public void confirm(String id) {
+        OrderInfoChangeRecord record = getBaseMapper().selectById(id);
+        if (record == null) {
+            throw new DefaultClientException("变更记录不存在！");
+        }
+        LambdaUpdateWrapper<OrderInfoChangeRecord> updateWrapper = Wrappers.lambdaUpdate(OrderInfoChangeRecord.class);
+        updateWrapper.set(OrderInfoChangeRecord::getExamineStatus, "AUDIT")
+                .eq(OrderInfoChangeRecord::getId, id);
+        getBaseMapper().update(updateWrapper);
+
+        flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", id, "SPEC_CHANGE_CONFIRM", record);
+    }
 }
 }

@@ -79,4 +79,11 @@ public interface OrderChangeRecordService extends BaseMpService<OrderInfoChangeR
      * @param id        主键ID
      * @param id        主键ID
      */
      */
     void output(String id);
     void output(String id);
+
+    /**
+     * 确认变更
+     *
+     * @param id        主键ID
+     */
+    void confirm(String id);
 }
 }

@@ -64,6 +64,7 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
      */
      */
     @ApiModelProperty("办事处")
     @ApiModelProperty("办事处")
     private String deptId;
     private String deptId;
+    private String deptName;
 
 
     /**
     /**
      * 生产厂
      * 生产厂

@@ -109,6 +109,9 @@
             <if test="vo.deptId != null and vo.deptId != ''">
             <if test="vo.deptId != null and vo.deptId != ''">
                 AND tb.dept_id = #{vo.deptId}
                 AND tb.dept_id = #{vo.deptId}
             </if>
             </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND sd.name = #{vo.deptName}
+            </if>
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>