楚江ERP：发货计划-草稿要车单基础方法

@@ -26,6 +26,12 @@ public class GetRequestCarTicketBo extends BaseBo<RequestCarTicket> {
     private String id;
 
     /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     @ApiModelProperty("要车日期")

@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -30,6 +31,11 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String id;
 
     /**
+     * 订货单ID
+     */
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     private LocalDate requestCarData;

@@ -5,6 +5,7 @@ import com.lframework.starter.bpm.enums.FlowInstanceStatus;
 import com.lframework.starter.bpm.service.BusinessDataHandlerService;
 import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.components.redis.RedisHandler;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
@@ -17,6 +18,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.order.*;
+import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
@@ -69,6 +71,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private TransactorHandler transactorHandler;
     @Resource
     private SpecLockDelayApplicationService specLockDelayApplicationService;
+    @Resource
+    private RequestCarTicketService requestCarTicketService;
 
 
     /**
@@ -124,6 +128,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "SPEC_LOCK_DELAY":
                 handleSpecLockDelayAuditData(flowStatus, businessId);
                 break;
+            case "REQUEST_CAR_TICKET":
+                handleRequestCarTicketData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -383,4 +390,24 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             orderChangeRecordService.updateStatus(businessId, "REFUSE");
         }
     }
+
+    /**
+     * 发货计划-草稿要车单业务数据处理
+     *
+     * @param businessId 业务ID
+     */
+    private void handleRequestCarTicketData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            requestCarTicketService.updateStatus(businessId, "PASS");
+            //更新外办审核人
+            requestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            requestCarTicketService.updateStatus(businessId, "REFUSE");
+            //更新外办审核人
+            requestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
+        }
+    }
 }

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.impl.shipments.car;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -26,10 +28,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTicketMapper, RequestCarTicket> implements RequestCarTicketService {
+    private static final String BPM_FLAG = "REQUEST_CAR_TICKET";
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
 
     @Override
     public PageResult<RequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryRequestCarTicketVo vo) {
@@ -62,6 +68,9 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
 
         RequestCarTicket data = new RequestCarTicket();
         data.setId(IdUtil.getId());
+        if (!StringUtil.isBlank(vo.getPurchaseOrderId())) {
+            data.setPurchaseOrderId(vo.getPurchaseOrderId());
+        }
         if (vo.getRequestCarData() != null) {
             data.setRequestCarData(vo.getRequestCarData());
         }
@@ -121,6 +130,9 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+        //开启审核
+        data.setUpdateById(SecurityUtil.getCurrentUser().getId());
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         return data.getId();
     }
@@ -136,6 +148,7 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         }
 
         LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
+                .set(RequestCarTicket::getPurchaseOrderId, StringUtil.isBlank(vo.getPurchaseOrderId()) ? null : vo.getPurchaseOrderId())
                 .set(RequestCarTicket::getRequestCarData, vo.getRequestCarData() == null ? null : vo.getRequestCarData())
                 .set(RequestCarTicket::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
                 .set(RequestCarTicket::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
@@ -160,6 +173,9 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+        //开启审核
+        RequestCarTicket requestCarTicket = getBaseMapper().selectById(vo.getId());
+        flowInstanceWrapperService.startInstance(BPM_FLAG, requestCarTicket.getId(), BPM_FLAG, requestCarTicket);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "修改草稿要车单状态，ID：{}", params = {"#id"})
@@ -183,6 +199,35 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         OpLogUtil.setExtra(id);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "更新草稿要车单审核人，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        RequestCarTicket data = getBaseMapper().findById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("草稿要车单不存在！");
+        }
+        LambdaUpdateWrapper<RequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(RequestCarTicket.class)
+                .eq(RequestCarTicket::getId, id);
+        if (externalAuditor != null) {
+            updateWrapper.set(RequestCarTicket::getExternalAuditor, externalAuditor);
+        }
+        if (businessOfficeAuditor != null) {
+            updateWrapper.set(RequestCarTicket::getBusinessOfficeAuditor, businessOfficeAuditor);
+        }
+        if (operationsDepartmentAuditor != null) {
+            updateWrapper.set(RequestCarTicket::getOperationsDepartmentAuditor, operationsDepartmentAuditor);
+        }
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(id);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "删除要车单表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -55,6 +55,16 @@ public interface RequestCarTicketService extends BaseMpService<RequestCarTicket>
     void updateStatus(String id, String status);
 
     /**
+     * 更新审核人
+     *
+     * @param id     主键
+     * @param externalAuditor 外办审核人
+     * @param businessOfficeAuditor 经营办审核人
+     * @param operationsDepartmentAuditor 运作科审核人
+     */
+    void updateExamineUser(String id, String externalAuditor, String businessOfficeAuditor, String operationsDepartmentAuditor);
+
+    /**
      * 根据ID删除
      * @param id
      * @return

@@ -16,6 +16,12 @@ public class CreateRequestCarTicketVo implements BaseVo, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     @ApiModelProperty("要车日期")

@@ -24,6 +24,12 @@ public class UpdateRequestCarTicketVo implements BaseVo, Serializable {
     private String id;
 
     /**
+     * 订货单ID
+     */
+    @ApiModelProperty("订货单ID")
+    private String purchaseOrderId;
+
+    /**
      * 要车日期
      */
     @ApiModelProperty("要车日期")

@@ -4,6 +4,7 @@
 
     <resultMap id="RequestCarTicket" type="com.lframework.xingyun.sc.entity.RequestCarTicket">
         <id column="id" property="id"/>
+        <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="request_car_data" property="requestCarData"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
@@ -38,6 +39,7 @@
     <sql id="RequestCarTicket_sql">
         SELECT
             tb.id,
+            tb.purchase_order_id,
             tb.request_car_data,
             tb.dept_id,
             sd.name AS dept_name,