朱园亮 / xingyun-erp · Commits

Commit 9b3cd187eb9ad9369640f7bc4f10ab6188a7e64b

Authored by yeqianyong
1 parent 855e634d

楚江ERP-订货单规格变更逻辑

Inline Side-by-side
Showing 2 changed files with 31 additions and 1 deletions
@@ -143,6 +143,13 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto { @@ -143,6 +143,13 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
143 private String deptId; 143 private String deptId;
144 144
145 /** 145 /**
  146 + * 办事处编号
  147 + * 非持久化字段
  148 + */
  149 + @TableField(exist = false)
  150 + private String deptCode;
  151 +
  152 + /**
146 * 办事处名称(非持久化字段) 153 * 办事处名称(非持久化字段)
147 */ 154 */
148 @TableField(exist = false) 155 @TableField(exist = false)
@@ -160,6 +167,13 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto { @@ -160,6 +167,13 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
160 private String workshopName; 167 private String workshopName;
161 168
162 /** 169 /**
  170 + * 生产厂编号
  171 + * 非持久化字段
  172 + */
  173 + @TableField(exist = false)
  174 + private String workshopCode;
  175 +
  176 + /**
163 * 客户资信Id 177 * 客户资信Id
164 */ 178 */
165 private String customerCreditId; 179 private String customerCreditId;
@@ -28,12 +28,12 @@ import com.lframework.xingyun.sc.entity.PurchaseOrderInfo; @@ -28,12 +28,12 @@ import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
28 import com.lframework.xingyun.sc.entity.PurchaseOrderLine; 28 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
29 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus; 29 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
30 import com.lframework.xingyun.sc.handlers.MessageHandler; 30 import com.lframework.xingyun.sc.handlers.MessageHandler;
  31 +import com.lframework.xingyun.sc.handlers.TransactorHandler;
31 import com.lframework.xingyun.sc.service.customer.CustomerCreditService; 32 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
32 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService; 33 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
33 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService; 34 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
34 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo; 35 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
35 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo; 36 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
36 -import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;  
37 import com.lframework.xingyun.sc.vo.order.change.*; 37 import com.lframework.xingyun.sc.vo.order.change.*;
38 import org.apache.commons.collections4.CollectionUtils; 38 import org.apache.commons.collections4.CollectionUtils;
39 import org.apache.commons.lang3.BooleanUtils; 39 import org.apache.commons.lang3.BooleanUtils;
@@ -75,6 +75,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR @@ -75,6 +75,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
75 private FlowTaskWrapperMapper flowTaskWrapperMapper; 75 private FlowTaskWrapperMapper flowTaskWrapperMapper;
76 @Resource 76 @Resource
77 private WorkshopService workshopService; 77 private WorkshopService workshopService;
  78 + @Resource
  79 + private TransactorHandler transactorHandler;
78 80
79 81
80 @Override 82 @Override
@@ -213,6 +215,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR @@ -213,6 +215,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
213 if (!StringUtil.isBlank(vo.getWorkshopId())) { 215 if (!StringUtil.isBlank(vo.getWorkshopId())) {
214 Workshop workshop = workshopService.findById(vo.getWorkshopId()); 216 Workshop workshop = workshopService.findById(vo.getWorkshopId());
215 data.setWorkshopName(workshop == null ? null : workshop.getName()); 217 data.setWorkshopName(workshop == null ? null : workshop.getName());
  218 + data.setWorkshopCode(workshop == null ? null : workshop.getCode());
216 data.setWorkshopId(vo.getWorkshopId()); 219 data.setWorkshopId(vo.getWorkshopId());
217 } 220 }
218 if (vo.getTotalQuantity() != null) { 221 if (vo.getTotalQuantity() != null) {
@@ -278,6 +281,19 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR @@ -278,6 +281,19 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
278 .set(OrderInfoChangeRecord::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee()) 281 .set(OrderInfoChangeRecord::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
279 .eq(OrderInfoChangeRecord::getId, vo.getId()); 282 .eq(OrderInfoChangeRecord::getId, vo.getId());
280 getBaseMapper().update(updateWrapper); 283 getBaseMapper().update(updateWrapper);
  284 + // 获取厂房数据
  285 + if (StringUtils.isNotBlank(data.getWorkshopId())) {
  286 + Workshop workshop = workshopService.findById(data.getWorkshopId());
  287 + if (workshop != null) {
  288 + data.setWorkshopName(workshop.getName());
  289 + data.setWorkshopCode(workshop.getCode());
  290 + }
  291 + }
  292 + // 获取办事处数据
  293 + String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
  294 + if (StringUtils.isNotBlank(deptCode)) {
  295 + data.setDeptCode(deptCode);
  296 + }
281 // 更新订货单物料行 297 // 更新订货单物料行
282 // 先删再增 298 // 先删再增
283 List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList(); 299 List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList();