楚江ERP-订货单确认变更bug修复

@@ -301,7 +301,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         Boolean output = data.getOutput();
         Boolean output = data.getOutput();
         if (BooleanUtils.isTrue(output)) {
         if (BooleanUtils.isTrue(output)) {
             // 获取办事处数据
             // 获取办事处数据
-            String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
+            String deptCode = transactorHandler.returnDeptCode(data.getCreateById());
             if (StringUtils.isNotBlank(deptCode)) {
             if (StringUtils.isNotBlank(deptCode)) {
                 data.setDeptCode(deptCode);
                 data.setDeptCode(deptCode);
             }
             }
@@ -401,7 +401,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         updateWrapper.set(OrderInfoChangeRecord::getExamineStatus, "AUDIT")
         updateWrapper.set(OrderInfoChangeRecord::getExamineStatus, "AUDIT")
                 .eq(OrderInfoChangeRecord::getId, id);
                 .eq(OrderInfoChangeRecord::getId, id);
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
-
+        // 获取办事处数据
+        String deptCode = transactorHandler.returnDeptCode(record.getCreateById());
+        if (StringUtils.isNotBlank(deptCode)) {
+            record.setDeptCode(deptCode);
+        }
+        // 发起流程
         flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", id, "SPEC_CHANGE_CONFIRM", record);
         flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", id, "SPEC_CHANGE_CONFIRM", record);
     }
     }
 }
 }

@@ -193,7 +193,7 @@
             </when>
             </when>
             <when test="vo.queryType == 'CHANGE'">
             <when test="vo.queryType == 'CHANGE'">
                 AND tb.examine_status = 'PASS'
                 AND tb.examine_status = 'PASS'
-                AND tb.status NOT IN ('SHIPPED', 'DELIVERED')
+                AND tb.status NOT IN ('SHIPPED', 'DELIVERED', 'CANCEL')
                 AND (tb.revoke_status != 'UNDOING' OR tb.revoke_status IS NULL)
                 AND (tb.revoke_status != 'UNDOING' OR tb.revoke_status IS NULL)
                 AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
                 AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
             </when>
             </when>