Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -154,11 +154,13 @@ create table if not exists  `tbl_contract_distributor_line`
     `length_tol_neg`       DECIMAL(10, 4) COMMENT '长度公差负',
     `status`               VARCHAR(50) COMMENT '状态',
     `quantity`             DECIMAL(15, 4)  COMMENT '数量',
+    `processing_fee`       DECIMAL(15, 4)  COMMENT '加工费',
     `unit_price`           DECIMAL(15, 4)  COMMENT '单价',
     `amount_excluding_tax` DECIMAL(15, 2) COMMENT '不含税金额',
     `total_amount`         DECIMAL(15, 2) COMMENT '总金额',
     `delivery_date`        DATE COMMENT '发货日期',
     `show_order`           INT      DEFAULT 0 COMMENT '排序',
+    `item_id`              varchar(50)    COMMENT '前端用ID',
     `create_by_id`         varchar(32)    not null comment '创建人ID',
     `create_by`            varchar(20)    not null comment '创建人',
     `update_by_id`         varchar(32)    not null comment '更新人ID',

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.bo.contract;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -79,6 +81,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    @ApiModelProperty(value = "加工费")
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     @ApiModelProperty("单价")
@@ -157,6 +165,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     @ApiModelProperty("长度公差负")
     private BigDecimal lengthTolNeg;
 
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
+
     public GetContractDistributorLineBo() {
 
     }

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

@@ -454,7 +454,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
             throw new DefaultClientException("参数错误！");
         }
 
-        // todo ymk 锁规接口待完善
+        contractDistributorStandardService.specificationLock(vo);
 
         contractDistributorStandardService.cleanCacheByKey(vo.getId());
 

@@ -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.controller.DefaultBaseController;
 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.service.order.OrderSpecificationChangeRecordService;
 import com.lframework.xingyun.sc.vo.order.change.CreateOrderSpecificationChangeRecordVo;
@@ -107,4 +108,16 @@ public class OrderSpecificationChangeRecordController extends DefaultBaseControl
         orderSpecificationChangeRecordService.deleteById(id);
         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();
+    }
 }

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -75,6 +76,11 @@ public class ContractDistributorLine extends BaseEntity implements BaseDto {
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     private BigDecimal unitPrice;
@@ -100,6 +106,11 @@ public class ContractDistributorLine extends BaseEntity implements BaseDto {
     private Integer showOrder;
 
     /**
+     * 前端用ID
+     */
+    private String itemId;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -77,6 +77,11 @@ public class OrderSpecificationChangeRecord extends BaseEntity implements BaseDt
     private String status;
 
     /**
+     * 变更原因及变更后的质量要求
+     */
+    private String description;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -175,6 +175,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String customerTier;
 
     /**
+     * 规格变更状态
+     */
+    private String specChangeStatus;
+
+    /**
      * 创建人ID
      */
     @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;
+    }
+}

@@ -73,6 +73,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         data.setLength(vo.getLength());
         data.setStatus(vo.getStatus());
         data.setQuantity(vo.getQuantity());
+        data.setProcessingFee(vo.getProcessingFee());
         data.setUnitPrice(vo.getUnitPrice());
         data.setAmountExcludingTax(vo.getAmountExcludingTax());
         data.setTotalAmount(vo.getTotalAmount());
@@ -85,6 +86,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         data.setWidthTolNeg(vo.getWidthTolNeg());
         data.setLengthTolPos(vo.getLengthTolPos());
         data.setLengthTolNeg(vo.getLengthTolNeg());
+        data.setItemId(vo.getItemId());
 
         getBaseMapper().insert(data);
 
@@ -114,6 +116,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
                 .set(ContractDistributorLine::getLength, vo.getLength())
                 .set(ContractDistributorLine::getStatus, vo.getStatus())
                 .set(ContractDistributorLine::getQuantity, vo.getQuantity())
+                .set(ContractDistributorLine::getProcessingFee, vo.getProcessingFee())
                 .set(ContractDistributorLine::getUnitPrice, vo.getUnitPrice())
                 .set(ContractDistributorLine::getAmountExcludingTax, vo.getAmountExcludingTax())
                 .set(ContractDistributorLine::getTotalAmount, vo.getTotalAmount())
@@ -126,6 +129,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
                 .set(ContractDistributorLine::getWidthTolNeg, vo.getWidthTolNeg())
                 .set(ContractDistributorLine::getLengthTolPos, vo.getLengthTolPos())
                 .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
+                .set(ContractDistributorLine::getItemId, vo.getItemId())
                 .eq(ContractDistributorLine::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);

@@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -238,6 +239,7 @@ public class ContractDistributorStandardServiceImpl extends
                 createContractDistributorLineVo.setLength(updateContractDistributorLineVo.getLength());
                 createContractDistributorLineVo.setStatus(updateContractDistributorLineVo.getStatus());
                 createContractDistributorLineVo.setQuantity(updateContractDistributorLineVo.getQuantity());
+                createContractDistributorLineVo.setProcessingFee(updateContractDistributorLineVo.getProcessingFee());
                 createContractDistributorLineVo.setUnitPrice(updateContractDistributorLineVo.getUnitPrice());
                 createContractDistributorLineVo.setAmountExcludingTax(updateContractDistributorLineVo.getAmountExcludingTax());
                 createContractDistributorLineVo.setTotalAmount(updateContractDistributorLineVo.getTotalAmount());
@@ -250,6 +252,7 @@ public class ContractDistributorStandardServiceImpl extends
                 createContractDistributorLineVo.setWidthTolNeg(updateContractDistributorLineVo.getWidthTolNeg());
                 createContractDistributorLineVo.setLengthTolPos(updateContractDistributorLineVo.getLengthTolPos());
                 createContractDistributorLineVo.setLengthTolNeg(updateContractDistributorLineVo.getLengthTolNeg());
+                createContractDistributorLineVo.setItemId(updateContractDistributorLineVo.getItemId());
 
                 contractDistributorLineService.create(createContractDistributorLineVo);
             }
@@ -558,6 +561,72 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
     }
 
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "合同锁规，ID：{}", params = {"#vo.id"})
+    @Transactional(rollbackFor = Exception.class)
+    public void specificationLock(UpdateContractDistributorStandardVo vo) {
+        ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同不存在！");
+        }
+
+        List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
+        if (CollectionUtils.isEmpty(lineVoList)) {
+            throw new DefaultClientException("合同行数据为空！");
+        }
+
+        Wrapper<ContractDistributorStandard> childWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .eq(ContractDistributorStandard::getParentId, vo.getId());
+
+        List<ContractDistributorStandard> childContractList = getBaseMapper().selectList(childWrapper);
+        BigDecimal allChildTotalQuantity = vo.getTotalQuantity().add(CollectionUtils.isEmpty(childContractList) ? new BigDecimal(0) : childContractList.get(0).getTotalQuantity());
+        if (allChildTotalQuantity.compareTo(data.getTotalQuantity()) > 0) {
+            throw new DefaultClientException("锁规总数量大于合同总数量，锁规失败！");
+        }
+
+        // 判断锁规是否完成（锁规两次或锁规数量等于合同数量）
+        boolean checkPriceSpecLocked = CollectionUtils.isNotEmpty(childContractList) || (allChildTotalQuantity.compareTo(data.getTotalQuantity()) == 0);
+
+        data.setId(IdUtil.getUUID());
+        data.setTotalQuantity(vo.getTotalQuantity());
+        data.setTotalAmountCapital(vo.getTotalAmountCapital());
+        data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
+        data.setTotalAmountIncludingTax(vo.getTotalAmountIncludingTax());
+        data.setStatus("STANDARD");
+        data.setParentId(vo.getId());
+        getBaseMapper().insert(data);
+
+        Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
+                .eq(ContractDistributorLine::getContractId, vo.getId())
+                .orderByAsc(ContractDistributorLine::getShowOrder);
+        List<ContractDistributorLine> oldContractDistributorLineList = contractDistributorLineService.list(lineWrapper);
+        Map<String, ContractDistributorLine> contractDistributorLineMap = CollectionUtils.emptyIfNull(oldContractDistributorLineList)
+                .stream().collect(Collectors.toMap(ContractDistributorLine::getId, Function.identity()));
+
+        for (UpdateContractDistributorLineVo lineVo : lineVoList) {
+            ContractDistributorLine contractDistributorLine = contractDistributorLineMap.remove(lineVo.getId());
+            if (contractDistributorLine == null) {
+                throw new DefaultClientException("合同行数据不存在！");
+            }
+
+            contractDistributorLine.setId(IdUtil.getUUID());
+            contractDistributorLine.setContractId(data.getId());
+            contractDistributorLine.setQuantity(lineVo.getQuantity());
+            contractDistributorLine.setUnitPrice(lineVo.getUnitPrice());
+            contractDistributorLine.setAmountExcludingTax(lineVo.getAmountExcludingTax());
+            contractDistributorLine.setTotalAmount(lineVo.getTotalAmount());
+            contractDistributorLineService.getBaseMapper().insert(contractDistributorLine);
+        }
+
+        Wrapper<ContractDistributorStandard> changeLocked = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getPriceSpecLocked, checkPriceSpecLocked)
+                .eq(ContractDistributorStandard::getId, vo.getId());
+        getBaseMapper().update(changeLocked);
+
+        OpLogUtil.setVariable("id", vo.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -3,30 +3,32 @@ package com.lframework.xingyun.sc.impl.order;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.*;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.OrderSpecificationChangeRecord;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
-import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
-import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 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.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.vo.order.CreatePurchaseOrderLineVo;
-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.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.OrderSpecificationChangeRecordMapper;
 import com.lframework.xingyun.sc.service.order.OrderSpecificationChangeRecordService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 
 @Service
@@ -35,6 +37,10 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
 
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private SysUserService sysUserService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
     @Override
@@ -69,7 +75,7 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         }
         // 变更前
         Map<String, List<PurchaseOrderLine>> beforeChangeMap = new HashMap<>(orderIds.size());
-        List<PurchaseOrderLine> beforeChangeList = purchaseOrderLineService.listByIds(orderIds);
+        List<PurchaseOrderLine> beforeChangeList = purchaseOrderLineService.listByOrderIds(orderIds);
         for (PurchaseOrderLine purchaseOrderLine : beforeChangeList) {
             String purchaseOrderId = purchaseOrderLine.getPurchaseOrderId();
             List<PurchaseOrderLine> list = beforeChangeMap.computeIfAbsent(purchaseOrderId, k -> new ArrayList<>());
@@ -95,9 +101,20 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
 
     @Override
     public OrderSpecificationChangeRecord findById(String id) {
+        OrderSpecificationChangeRecord changeRecord = getBaseMapper().selectById(id);
+        if (changeRecord == null) {
+            throw new DefaultClientException("订货单规格变更记录不存在!");
+        };
+        String orderId = changeRecord.getOrderId();
+        // 获取规格数据
+        // 变更前
+        List<PurchaseOrderLine> beforeChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(orderId));
+        changeRecord.setBeforeChangeSpecList(beforeChangeList);
+        // 变更后
+        List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByChangeIds(Collections.singletonList(id));
+        changeRecord.setAfterChangeSpecList(afterChangeList);
 
-
-        return getBaseMapper().selectById(id);
+        return changeRecord;
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增订货单规格变更记录，ID：{}", params = {"#id"})
@@ -110,10 +127,39 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         data.setOrderId(vo.getOrderId());
         data.setOrderQuantity(vo.getOrderQuantity());
         data.setDeliveryDate(vo.getDeliveryDate());
+        // 审核中
+        data.setStatus("AUDIT");
 
-        getBaseMapper().insert(data);
+        // 获取当前人员信息
+        String userId = SecurityUtil.getCurrentUser().getId();
+        SysUser user = sysUserService.findById(userId);
         // 处理规格数据
+        BigDecimal totalQuantity = new BigDecimal(0);
+        List<PurchaseOrderLine> orderLineList = new ArrayList<>();
         List<CreateOrderSpecificationInfoVo> orderSpecList = vo.getOrderSpecList();
+        for (int i = 0; i < orderSpecList.size(); i++) {
+            CreateOrderSpecificationInfoVo createSpecVo = orderSpecList.get(i);
+            PurchaseOrderLine orderLine = JsonUtil.parseObject(JsonUtil.toJsonString(createSpecVo), PurchaseOrderLine.class);
+            orderLine.setId(IdUtil.getId());
+            orderLine.setChangeId(id);
+            orderLine.setCreateById(userId);
+            orderLine.setCreateBy(user.getName());
+            orderLine.setUpdateById(userId);
+            orderLine.setUpdateBy(user.getName());
+            if (orderLine.getShowOrder() == null) {
+                orderLine.setShowOrder(i + 1);
+            }
+            totalQuantity = totalQuantity.add(orderLine.getQuantity());
+
+            orderLineList.add(orderLine);
+        }
+        if (data.getOrderQuantity() == null) {
+            data.setOrderQuantity(totalQuantity.doubleValue());
+        }
+        getBaseMapper().insert(data);
+        purchaseOrderLineService.batchAdd(orderLineList);
+        // 更新订货单规格变更状态
+        purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
@@ -133,10 +179,30 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
                 .set(OrderSpecificationChangeRecord::getOrderId, vo.getOrderId())
                 .set(OrderSpecificationChangeRecord::getOrderQuantity, vo.getOrderQuantity())
                 .set(OrderSpecificationChangeRecord::getDeliveryDate, vo.getDeliveryDate())
+                .set(OrderSpecificationChangeRecord::getStatus, "AUDIT")
                 .eq(OrderSpecificationChangeRecord::getId, vo.getId());
-        getBaseMapper().update(updateWrapper);
+        // 获取当前人员信息
+        String userId = SecurityUtil.getCurrentUser().getId();
+        SysUser user = sysUserService.findById(userId);
         // 更新规格数据
+        BigDecimal totalQuantity = new BigDecimal(0);
+        List<PurchaseOrderLine> orderLineList = new ArrayList<>();
         List<UpdateOrderSpecificationInfoVo> orderSpecList = vo.getOrderSpecList();
+        for (UpdateOrderSpecificationInfoVo updateSpecVo : orderSpecList) {
+            PurchaseOrderLine orderLine = JsonUtil.parseObject(JsonUtil.toJsonString(updateSpecVo), PurchaseOrderLine.class);
+            orderLine.setUpdateById(userId);
+            orderLine.setUpdateBy(user.getName());
+            totalQuantity = totalQuantity.add(orderLine.getQuantity());
+
+            orderLineList.add(orderLine);
+        }
+        if (vo.getOrderQuantity() == null) {
+            updateWrapper.set(OrderSpecificationChangeRecord::getOrderQuantity, totalQuantity.doubleValue());
+        } else {
+            updateWrapper.set(OrderSpecificationChangeRecord::getOrderQuantity, vo.getOrderQuantity());
+        }
+        getBaseMapper().update(updateWrapper);
+        purchaseOrderLineService.batchUpdate(orderLineList);
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
@@ -148,4 +214,29 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
     public void deleteById(String 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);
     }
 
+    /**
+     * 更新规格变更状态
+     *
+     * @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
     public void cleanCacheByKey(Serializable key) {
 

@@ -24,7 +24,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
@@ -209,17 +209,43 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
 
     @Override
-    public List<PurchaseOrderLine> listByOrderId(String orderId) {
-        if (StringUtils.isBlank(orderId)) {
+    public List<PurchaseOrderLine> listByOrderIds(List<String> orderIds) {
+        if (CollectionUtils.isEmpty(orderIds)) {
             return Collections.emptyList();
         }
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
-        queryWrapper.eq(PurchaseOrderLine::getChangeId, orderId)
+        queryWrapper.in(PurchaseOrderLine::getPurchaseOrderId, orderIds)
                 .orderByAsc(PurchaseOrderLine::getShowOrder);
 
         return getBaseMapper().selectList(queryWrapper);
     }
 
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    @Override
+    public void batchAdd(List<PurchaseOrderLine> specList) {
+        if (CollectionUtils.isEmpty(specList)) {
+            return;
+        }
+        getBaseMapper().batchAdd(specList);
+    }
+
+    /**
+     * 批量更新
+     *
+     * @param specList  数据集合
+     */
+    @Override
+    public void batchUpdate(List<PurchaseOrderLine> specList) {
+        if (CollectionUtils.isEmpty(specList)) {
+            return;
+        }
+        getBaseMapper().batchUpdate(specList);
+    }
+
     @Override
     public void cleanCacheByKey(Serializable key) {
 

@@ -21,4 +21,18 @@ public interface PurchaseOrderLineMapper extends BaseMapper<PurchaseOrderLine> {
      * @return
      */
     List<PurchaseOrderLine> query(@Param("vo") QueryPurchaseOrderLineVo vo);
+
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    int batchAdd(@Param("specList") List<PurchaseOrderLine> specList);
+
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    int batchUpdate(@Param("specList") List<PurchaseOrderLine> specList);
 }

@@ -88,4 +88,11 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      */
     void stockContractPriceLock(UpdateContractDistributorStandardVo vo);
 
+    /**
+     * 锁规
+     *
+     * @param vo
+     */
+    void specificationLock(UpdateContractDistributorStandardVo vo);
+
 }
\ No newline at end of file

@@ -57,4 +57,12 @@ public interface OrderSpecificationChangeRecordService extends BaseMpService<Ord
      * @param id    主键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 撤销状态
      */
     void updateRevokeStatus(String id, String status);
+
+    /**
+     * 更新规格变更状态
+     *
+     * @param id        主键ID
+     * @param status    状态
+     */
+    void updateSpecChangeStatus(String id, String status);
 }

@@ -75,8 +75,22 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
     /**
      * 根据订货单ID查询
      *
-     * @param orderId   订货单ID
+     * @param orderIds  订货单ID集合
      * @return          List<PurchaseOrderLine>
      */
-    List<PurchaseOrderLine> listByOrderId(String orderId);
+    List<PurchaseOrderLine> listByOrderIds(List<String> orderIds);
+
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    void batchAdd(List<PurchaseOrderLine> specList);
+
+    /**
+     * 批量更新
+     *
+     * @param specList  数据集合
+     */
+    void batchUpdate(List<PurchaseOrderLine> specList);
 }

@@ -92,6 +92,14 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    @ApiModelProperty(value = "加工费")
+    @TypeMismatch(message = "加工费格式有误！")
+    @IsNumberPrecision(message = "加工费最多允许4位小数！", value = 4)
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     @ApiModelProperty(value = "单价")
@@ -178,4 +186,9 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
     @TypeMismatch(message = "长度公差负格式有误！")
     private BigDecimal lengthTolNeg;
 
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
 }

@@ -96,6 +96,14 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
     private BigDecimal quantity;
 
     /**
+     * 加工费
+     */
+    @ApiModelProperty(value = "加工费")
+    @TypeMismatch(message = "加工费格式有误！")
+    @IsNumberPrecision(message = "加工费最多允许4位小数！", value = 4)
+    private BigDecimal processingFee;
+
+    /**
      * 单价
      */
     @ApiModelProperty(value = "单价")
@@ -181,5 +189,10 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
     @TypeMismatch(message = "长度公差负格式有误！")
     private BigDecimal lengthTolNeg;
 
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
 }
 

@@ -9,7 +9,6 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
-import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import io.swagger.annotations.ApiModelProperty;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import org.hibernate.validator.constraints.Length;
@@ -48,6 +47,12 @@ public class CreateOrderSpecificationChangeRecordVo implements BaseVo, Serializa
     private LocalDate deliveryDate;
 
     /**
+     * 变更原因及变更后的质量要求
+     */
+    @ApiModelProperty(value = "变更原因及变更后的质量要求")
+    private String description;
+
+    /**
      * 规格变更记录
      */
     @Valid

@@ -53,6 +53,12 @@ public class UpdateOrderSpecificationChangeRecordVo implements BaseVo, Serializa
     private LocalDate deliveryDate;
 
     /**
+     * 变更原因及变更后的质量要求
+     */
+    @ApiModelProperty(value = "变更原因及变更后的质量要求")
+    private String description;
+
+    /**
      * 规格变更记录
      */
     @Valid

@@ -13,6 +13,7 @@
         <result column="length" property="length"/>
         <result column="status" property="status"/>
         <result column="quantity" property="quantity"/>
+        <result column="processing_fee" property="processingFee"/>
         <result column="unit_price" property="unitPrice"/>
         <result column="amount_excluding_tax" property="amountExcludingTax"/>
         <result column="total_amount" property="totalAmount"/>
@@ -31,6 +32,7 @@
         <result column="width_tol_neg" property="widthTolNeg"/>
         <result column="length_tol_pos" property="lengthTolPos"/>
         <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="item_id" property="itemId"/>
     </resultMap>
 
     <sql id="ContractDistributorLine_sql">
@@ -44,6 +46,7 @@
                tb.length,
                tb.status,
                tb.quantity,
+               tb.processing_fee,
                tb.unit_price,
                tb.amount_excluding_tax,
                tb.total_amount,
@@ -61,7 +64,8 @@
                tb.width_tol_pos,
                tb.width_tol_neg,
                tb.length_tol_pos,
-               tb.length_tol_neg
+               tb.length_tol_neg,
+               tb.item_id
         FROM tbl_contract_distributor_line AS tb
     </sql>
 

@@ -80,4 +80,115 @@
         </where>
         ORDER BY tb.show_order ASC
     </select>
+
+    <insert id="batchAdd" parameterType="java.util.List">
+        INSERT INTO tbl_purchase_order_line (
+        id, purchase_order_id, change_id, industry, quality, brand,
+        thickness, thickness_tol_pos, thickness_tol_neg,
+        width, width_tol_pos, width_tol_neg,
+        length, length_tol_pos, length_tol_neg,
+        status, quantity, sales_price, delivery_date, show_order,
+        assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by
+        ) VALUES
+        <foreach collection="specList" item="item" separator=",">
+            (
+            #{item.id}, #{item.purchaseOrderId}, #{item.changeId}, #{item.industry}, #{item.quality}, #{item.brand},
+            #{item.thickness}, #{item.thicknessTolPos}, #{item.thicknessTolNeg},
+            #{item.width}, #{item.widthTolPos}, #{item.widthTolNeg},
+            #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
+            #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
+            #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy}
+            )
+        </foreach>
+    </insert>
+
+    <update id="batchUpdate" parameterType="java.util.List">
+        UPDATE tbl_purchase_order_line
+        SET
+        industry =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.industry}
+        </foreach>,
+        quality =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.quality}
+        </foreach>,
+        brand =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.brand}
+        </foreach>,
+        thickness =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.thickness}
+        </foreach>,
+        thickness_tol_pos =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.thicknessTolPos}
+        </foreach>,
+        thickness_tol_neg =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.thicknessTolNeg}
+        </foreach>,
+        width =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.width}
+        </foreach>,
+        width_tol_pos =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.widthTolPos}
+        </foreach>,
+        width_tol_neg =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.widthTolNeg}
+        </foreach>,
+        length =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.length}
+        </foreach>,
+        length_tol_pos =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.lengthTolPos}
+        </foreach>,
+        length_tol_neg =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.lengthTolNeg}
+        </foreach>,
+        status =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.status}
+        </foreach>,
+        quantity =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.quantity}
+        </foreach>,
+        sales_price =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.salesPrice}
+        </foreach>,
+        delivery_date =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.deliveryDate}
+        </foreach>,
+        show_order =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.showOrder}
+        </foreach>,
+        assessment_exceeds_agreement =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.assessmentExceedsAgreement}
+        </foreach>,
+        update_by_id =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.updateById}
+        </foreach>,
+        update_by =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.updateBy}
+        </foreach>,
+        update_time = NOW()
+        WHERE id IN
+        <foreach collection="specList" item="item" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
 </mapper>