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

@@ -143,6 +143,13 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     private String deptId;
 
     /**
+     * 办事处编号
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    private String deptCode;
+
+    /**
      * 办事处名称(非持久化字段)
      */
     @TableField(exist = false)
@@ -160,6 +167,13 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     private String workshopName;
 
     /**
+     * 生产厂编号
+     * 非持久化字段
+     */
+    @TableField(exist = false)
+    private String workshopCode;
+
+    /**
      * 客户资信Id
      */
     private String customerCreditId;

@@ -28,12 +28,12 @@ import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.handlers.MessageHandler;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
-import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.change.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -75,6 +75,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Resource
     private WorkshopService workshopService;
+    @Resource
+    private TransactorHandler transactorHandler;
 
 
     @Override
@@ -213,6 +215,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
             Workshop workshop = workshopService.findById(vo.getWorkshopId());
             data.setWorkshopName(workshop == null ? null : workshop.getName());
+            data.setWorkshopCode(workshop == null ? null : workshop.getCode());
             data.setWorkshopId(vo.getWorkshopId());
         }
         if (vo.getTotalQuantity() != null) {
@@ -278,6 +281,19 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 .set(OrderInfoChangeRecord::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .eq(OrderInfoChangeRecord::getId, vo.getId());
         getBaseMapper().update(updateWrapper);
+        // 获取厂房数据
+        if (StringUtils.isNotBlank(data.getWorkshopId())) {
+            Workshop workshop = workshopService.findById(data.getWorkshopId());
+            if (workshop != null) {
+                data.setWorkshopName(workshop.getName());
+                data.setWorkshopCode(workshop.getCode());
+            }
+        }
+        // 获取办事处数据
+        String deptCode = transactorHandler.returnDeptCode(SecurityUtil.getCurrentUser().getId());
+        if (StringUtils.isNotBlank(deptCode)) {
+            data.setDeptCode(deptCode);
+        }
         // 更新订货单物料行
         // 先删再增
         List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList();