朱园亮 / xingyun-erp · Commits

Commit b5f96c99d1504b6c0068edad667b7e64a70fbe39

Authored by 房远帅
1 parent 8ab74099

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

Inline Side-by-side
Showing 2 changed files with 37 additions and 0 deletions
@@ -64,6 +64,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto { @@ -64,6 +64,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
64 private String deptName; 64 private String deptName;
65 65
66 /** 66 /**
  67 + * 办事处编码(非持久化字段)
  68 + */
  69 + @TableField(exist = false)
  70 + private String deptCode;
  71 +
  72 + /**
67 * 原订货日期 73 * 原订货日期
68 */ 74 */
69 private LocalDate orderDate; 75 private LocalDate orderDate;
@@ -127,6 +133,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto { @@ -127,6 +133,12 @@ public class PurchaseOrderRevoke extends BaseEntity implements BaseDto {
127 private boolean showExamine = false; 133 private boolean showExamine = false;
128 134
129 /** 135 /**
  136 + * 厂办编码(非持久化字段)
  137 + */
  138 + @TableField(exist = false)
  139 + private String workshopCode;
  140 +
  141 + /**
130 * 创建人ID 142 * 创建人ID
131 */ 143 */
132 @TableField(fill = FieldFill.INSERT) 144 @TableField(fill = FieldFill.INSERT)
@@ -22,9 +22,12 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog; @@ -22,9 +22,12 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
22 import com.lframework.starter.web.core.utils.PageHelperUtil; 22 import com.lframework.starter.web.core.utils.PageHelperUtil;
23 import com.lframework.starter.common.utils.Assert; 23 import com.lframework.starter.common.utils.Assert;
24 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType; 24 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
  25 +import com.lframework.xingyun.basedata.entity.Workshop;
  26 +import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
25 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo; 27 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
26 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke; 28 import com.lframework.xingyun.sc.entity.PurchaseOrderRevoke;
27 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine; 29 import com.lframework.xingyun.sc.entity.PurchaseOrderRevokeLine;
  30 +import com.lframework.xingyun.sc.handlers.TransactorHandler;
28 import com.lframework.xingyun.sc.mappers.PurchaseOrderRevokeMapper; 31 import com.lframework.xingyun.sc.mappers.PurchaseOrderRevokeMapper;
29 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService; 32 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
30 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService; 33 import com.lframework.xingyun.sc.service.order.PurchaseOrderRevokeLineService;
@@ -54,6 +57,10 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr @@ -54,6 +57,10 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
54 private FlowInstanceWrapperService flowInstanceWrapperService; 57 private FlowInstanceWrapperService flowInstanceWrapperService;
55 @Resource 58 @Resource
56 private FlowTaskWrapperMapper flowTaskWrapperMapper; 59 private FlowTaskWrapperMapper flowTaskWrapperMapper;
  60 + @Resource
  61 + private TransactorHandler transactorHandler;
  62 + @Resource
  63 + private WorkshopService workshopService;
57 64
58 @Override 65 @Override
59 public PageResult<PurchaseOrderRevoke> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeVo vo) { 66 public PageResult<PurchaseOrderRevoke> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderRevokeVo vo) {
@@ -187,6 +194,15 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr @@ -187,6 +194,15 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
187 194
188 //开启审核 195 //开启审核
189 data.setUserId(SecurityUtil.getCurrentUser().getId()); 196 data.setUserId(SecurityUtil.getCurrentUser().getId());
  197 + String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
  198 + data.setDeptCode(deptCode);
  199 + PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
  200 + if (StringUtils.isNotEmpty(purchaseOrderInfo.getWorkshopId())) {
  201 + Workshop workshop = workshopService.findById(purchaseOrderInfo.getWorkshopId());
  202 + if (workshop != null) {
  203 + data.setWorkshopCode(workshop.getCode());
  204 + }
  205 + }
190 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data); 206 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
191 207
192 return data.getId(); 208 return data.getId();
@@ -232,6 +248,15 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr @@ -232,6 +248,15 @@ public class PurchaseOrderRevokeServiceImpl extends BaseMpServiceImpl<PurchaseOr
232 data.setSumRevokeQuantity(bigDecimal); 248 data.setSumRevokeQuantity(bigDecimal);
233 //开启审核 249 //开启审核
234 data.setUserId(SecurityUtil.getCurrentUser().getId()); 250 data.setUserId(SecurityUtil.getCurrentUser().getId());
  251 + String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
  252 + data.setDeptCode(deptCode);
  253 + PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(data.getPurchaseOrderId());
  254 + if (StringUtils.isNotEmpty(purchaseOrderInfo.getWorkshopId())) {
  255 + Workshop workshop = workshopService.findById(purchaseOrderInfo.getWorkshopId());
  256 + if (workshop != null) {
  257 + data.setWorkshopCode(workshop.getCode());
  258 + }
  259 + }
235 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data); 260 flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
236 261
237 OpLogUtil.setVariable("id", data.getId()); 262 OpLogUtil.setVariable("id", data.getId());