楚江ERP:订货单撤销审核修改

@@ -64,6 +64,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private String deptName;
 
     /**
+     * 办事处编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String deptCode;
+
+    /**
      * 原订货日期
      */
     private LocalDate orderDate;
@@ -127,6 +133,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
     private boolean showExamine = false;
 
     /**
+     * 厂办编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String workshopCode;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -22,9 +22,12 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderRevokeMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
@@ -54,6 +57,10 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
     private FlowInstanceWrapperService flowInstanceWrapperService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private TransactorHandler transactorHandler;
+    @Resource
+    private WorkshopService workshopService;
 
     @Override
     public PageResult<PurchaseOrderRevoke> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeVo vo) {
@@ -187,6 +194,15 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
 
         //开启审核
         data.setUserId(SecurityUtil.getCurrentUser().getId());
+        String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
+        data.setDeptCode(deptCode);
+        PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
+        if (StringUtils.isNotEmpty(purchaseOrderInfo.getWorkshopId())) {
+            Workshop workshop = workshopService.findById(purchaseOrderInfo.getWorkshopId());
+            if (workshop != null) {
+                data.setWorkshopCode(workshop.getCode());
+            }
+        }
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         return data.getId();
@@ -232,6 +248,15 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
         data.setSumRevokeQuantity(bigDecimal);
         //开启审核
         data.setUserId(SecurityUtil.getCurrentUser().getId());
+        String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
+        data.setDeptCode(deptCode);
+        PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(data.getPurchaseOrderId());
+        if (StringUtils.isNotEmpty(purchaseOrderInfo.getWorkshopId())) {
+            Workshop workshop = workshopService.findById(purchaseOrderInfo.getWorkshopId());
+            if (workshop != null) {
+                data.setWorkshopCode(workshop.getCode());
+            }
+        }
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
 
         OpLogUtil.setVariable("id", data.getId());