楚江ERP-1、订货单增加规格变更状态；2、规格变更取消接口开发

@@ -216,6 +216,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("订货单表物料行")
     @ApiModelProperty("订货单表物料行")
     private List<PurchaseOrderLine> purchaseOrderLineList;
     private List<PurchaseOrderLine> purchaseOrderLineList;
 
 
+    /**
+     * 规格变更状态
+     */
+    @ApiModelProperty("规格变更状态")
+    private String specChangeStatus;
+
 
 
 
 
     public GetPurchaseOrderInfoBo() {
     public GetPurchaseOrderInfoBo() {

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.controller.order;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.xingyun.sc.bo.order.change.OrderSpecificationChangeRecordBo;
 import com.lframework.xingyun.sc.bo.order.change.OrderSpecificationChangeRecordBo;
+import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.vo.order.change.QueryOrderSpecificationChangeRecordVo;
 import com.lframework.xingyun.sc.vo.order.change.QueryOrderSpecificationChangeRecordVo;
 import com.lframework.xingyun.sc.service.order.OrderSpecificationChangeRecordService;
 import com.lframework.xingyun.sc.service.order.OrderSpecificationChangeRecordService;
 import com.lframework.xingyun.sc.vo.order.change.CreateOrderSpecificationChangeRecordVo;
 import com.lframework.xingyun.sc.vo.order.change.CreateOrderSpecificationChangeRecordVo;
@@ -107,4 +108,16 @@ public class OrderSpecificationChangeRecordController extends DefaultBaseControl
         orderSpecificationChangeRecordService.deleteById(id);
         orderSpecificationChangeRecordService.deleteById(id);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    /**
+     * 取消变更
+     */
+    @ApiOperation("取消变更")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"order:change:cancel"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancelById(@NotBlank(message = "id不能为空！") String id) {
+        orderSpecificationChangeRecordService.updateStatus(id, OrderSpecChangeStatus.CANCEL.getCode());
+        return InvokeResultBuilder.success();
+    }
 }
 }

@@ -175,6 +175,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String customerTier;
     private String customerTier;
 
 
     /**
     /**
+     * 规格变更状态
+     */
+    private String specChangeStatus;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

+package com.lframework.xingyun.sc.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.lframework.starter.web.core.enums.BaseEnum;
+
+public enum OrderSpecChangeStatus implements BaseEnum<String> {
+
+
+    IN_PROGRESS("IN_PROGRESS", "变更中"),
+    COMPLETED("COMPLETED", "已完成"),
+    CANCEL("CANCEL", "已取消"),
+    ;
+
+
+    @EnumValue
+    private final String code;
+
+    private final String desc;
+
+    OrderSpecChangeStatus(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    @Override
+    public String getDesc() {
+        return this.desc;
+    }
+
+
+    /**
+     * 通过code获取desc
+     *
+     * @param code 状态码
+     * @return 描述信息
+     */
+    public static String getDescByCode(String code) {
+        for (OrderSpecChangeStatus status : OrderSpecChangeStatus.values()) {
+            if (status.getCode().equals(code)) {
+                return status.getDesc();
+            }
+        }
+        return null;
+    }
+}

@@ -16,9 +16,12 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.vo.order.change.*;
 import com.lframework.xingyun.sc.vo.order.change.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.OrderSpecificationChangeRecordMapper;
 import com.lframework.xingyun.sc.mappers.OrderSpecificationChangeRecordMapper;
 import com.lframework.xingyun.sc.service.order.OrderSpecificationChangeRecordService;
 import com.lframework.xingyun.sc.service.order.OrderSpecificationChangeRecordService;
@@ -36,6 +39,8 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
     private PurchaseOrderLineService purchaseOrderLineService;
     private PurchaseOrderLineService purchaseOrderLineService;
     @Resource
     @Resource
     private SysUserService sysUserService;
     private SysUserService sysUserService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
 
 
     @Override
     @Override
@@ -153,6 +158,8 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         }
         }
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
         purchaseOrderLineService.batchAdd(orderLineList);
         purchaseOrderLineService.batchAdd(orderLineList);
+        // 更新订货单规格变更状态
+        purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
@@ -207,4 +214,29 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
     public void deleteById(String id) {
     public void deleteById(String id) {
         getBaseMapper().deleteById(id);
         getBaseMapper().deleteById(id);
     }
     }
+
+    /**
+     * 更新状态
+     *
+     * @param id        主键ID
+     * @param status    状态
+     */
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        OrderSpecificationChangeRecord record = getById(id);
+        if (record == null) {
+            throw new DefaultClientException("规格变更记录不存在！");
+        }
+        LambdaUpdateWrapper<OrderSpecificationChangeRecord> updateWrapper = Wrappers.lambdaUpdate(OrderSpecificationChangeRecord.class);
+        updateWrapper.set(OrderSpecificationChangeRecord::getStatus, status)
+                .eq(OrderSpecificationChangeRecord::getId, id);
+        getBaseMapper().update(updateWrapper);
+        if (OrderSpecChangeStatus.CANCEL.getCode().equals(status)) {
+            // 更新订货单规格变更状态
+            purchaseOrderInfoService.updateSpecChangeStatus(record.getOrderId(), status);
+        }
+    }
 }
 }

@@ -321,6 +321,23 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
     }
     }
 
 
+    /**
+     * 更新规格变更状态
+     *
+     * @param id        主键ID
+     * @param status    状态
+     */
+    @Override
+    public void updateSpecChangeStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                .set(PurchaseOrderInfo::getSpecChangeStatus, status)
+                .eq(PurchaseOrderInfo::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 

@@ -57,4 +57,12 @@ public interface OrderSpecificationChangeRecordService extends BaseMpService<Ord
      * @param id    主键ID
      * @param id    主键ID
      */
      */
     void deleteById(String id);
     void deleteById(String id);
+
+    /**
+     * 更新状态
+     *
+     * @param id        主键ID
+     * @param status    状态
+     */
+    void updateStatus(String id, String status);
 }
 }

@@ -88,4 +88,12 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param status 撤销状态
      * @param status 撤销状态
      */
      */
     void updateRevokeStatus(String id, String status);
     void updateRevokeStatus(String id, String status);
+
+    /**
+     * 更新规格变更状态
+     *
+     * @param id        主键ID
+     * @param status    状态
+     */
+    void updateSpecChangeStatus(String id, String status);
 }
 }