Merge branch 'master_after0506_tmp' into master_after0506

 package com.lframework.xingyun.sc.bo.contract;
 package com.lframework.xingyun.sc.bo.contract;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
@@ -480,6 +481,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private Boolean canSplit;
     private Boolean canSplit;
 
 
     /**
     /**
+     * 是否可锁价
+     */
+    @ApiModelProperty(value = "是否可锁价")
+    private Boolean canPriceLock;
+
+    /**
      * 创建人
      * 创建人
      */
      */
     @ApiModelProperty(value = "创建人")
     @ApiModelProperty(value = "创建人")

@@ -240,6 +240,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty(value = "是否可拆分")
     @ApiModelProperty(value = "是否可拆分")
     private Boolean canSplit;
     private Boolean canSplit;
 
 
+    /**
+     * 是否可锁价
+     */
+    @ApiModelProperty(value = "是否可锁价")
+    private Boolean canPriceLock;
+
 
 
     public QueryContractDistributorStandardBo() {
     public QueryContractDistributorStandardBo() {
 
 

@@ -266,6 +266,11 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
     @ApiModelProperty("合同类型")
     @ApiModelProperty("合同类型")
     private String contractType;
     private String contractType;
 
 
+    /**
+     * 订货单状态
+     */
+    @ApiModelProperty("订货单状态")
+    private String status;
 
 
     public OrderChangeRecordBo() {
     public OrderChangeRecordBo() {
 
 

@@ -107,6 +107,7 @@ public class OrderChangeRecordController extends DefaultBaseController {
                     result.setContractType(contractDistributorStandard.getType());
                     result.setContractType(contractDistributorStandard.getType());
                 }
                 }
             }
             }
+            result.setStatus(purchaseOrderInfo.getStatus());
         }
         }
 
 
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);
@@ -442,9 +443,17 @@ public class OrderChangeRecordController extends DefaultBaseController {
             return true;
             return true;
         }
         }
         return "UPDATE".equals(line.getType()) && (line.getBrandChange()
         return "UPDATE".equals(line.getType()) && (line.getBrandChange()
+                || line.getIndustryChange()
+                || line.getQualityChange()
                 || line.getLengthChange()
                 || line.getLengthChange()
+                || line.getLengthTolNegChange()
+                || line.getLengthTolPosChange()
                 || line.getWidthChange()
                 || line.getWidthChange()
+                || line.getWidthTolNegChange()
+                || line.getWidthTolPosChange()
                 || line.getThicknessChange()
                 || line.getThicknessChange()
+                || line.getThicknessTolNegChange()
+                || line.getThicknessTolPosChange()
                 || line.getStatusChange()
                 || line.getStatusChange()
                 || line.getQuantityChange()
                 || line.getQuantityChange()
                 || line.getSalesPriceChange()
                 || line.getSalesPriceChange()

@@ -369,6 +369,12 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private Boolean canSplit;
     private Boolean canSplit;
 
 
     /**
     /**
+     * 是否可锁价
+     */
+    @TableField(exist = false)
+    private Boolean canPriceLock;
+
+    /**
      * 剩余锁规数量
      * 剩余锁规数量
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -219,6 +219,7 @@ public class ContractDistributorStandardServiceImpl extends
 
 
         List<ContractDistributorStandard> datas = getBaseMapper().query(vo);
         List<ContractDistributorStandard> datas = getBaseMapper().query(vo);
         CollectionUtils.emptyIfNull(datas).forEach(data -> data.setCanSplit(isCanSplit(data)));
         CollectionUtils.emptyIfNull(datas).forEach(data -> data.setCanSplit(isCanSplit(data)));
+        fillCanPriceLock(datas);
         return datas;
         return datas;
     }
     }
 
 
@@ -239,6 +240,7 @@ public class ContractDistributorStandardServiceImpl extends
         }
         }
         data.setCanEdit(canEdit);
         data.setCanEdit(canEdit);
         fillRemainingQuantity(data);
         fillRemainingQuantity(data);
+        fillCanPriceLock(data);
 
 
         // 获取当前人员的待办任务数据
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
@@ -308,6 +310,73 @@ public class ContractDistributorStandardServiceImpl extends
         return true;
         return true;
     }
     }
 
 
+    /**
+     * 批量回填是否可锁价
+     *
+     * @param datas 合同列表
+     */
+    private void fillCanPriceLock(List<ContractDistributorStandard> datas) {
+        if (CollectionUtils.isEmpty(datas)) {
+            return;
+        }
+
+        List<ContractDistributorStandard> inventoryContracts = CollectionUtils.emptyIfNull(datas).stream()
+                .filter(Objects::nonNull)
+                .filter(this::isInventoryContract)
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(inventoryContracts)) {
+            CollectionUtils.emptyIfNull(datas).stream()
+                    .filter(Objects::nonNull)
+                    .forEach(data -> data.setCanPriceLock(false));
+            return;
+        }
+
+        CollectionUtils.emptyIfNull(datas).stream()
+                .filter(Objects::nonNull)
+                .forEach(data -> data.setCanPriceLock(
+                        isCanPriceLock(data)));
+    }
+
+    /**
+     * 回填是否可锁价
+     *
+     * @param data 合同
+     */
+    private void fillCanPriceLock(ContractDistributorStandard data) {
+        if (data == null || StringUtils.isBlank(data.getId())) {
+            return;
+        }
+
+        data.setCanPriceLock(isCanPriceLock(data));
+    }
+
+    /**
+     * 判断是否可锁价
+     *
+     * @param data 合同
+     * @return 是否可锁价
+     */
+    private boolean isCanPriceLock(ContractDistributorStandard data) {
+        if (!isInventoryContract(data)) {
+            return false;
+        }
+        if (Boolean.TRUE.equals(data.getPriceSpecLocked())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 判断是否为库存合同
+     *
+     * @param data 合同
+     * @return 是否为库存合同
+     */
+    private boolean isInventoryContract(ContractDistributorStandard data) {
+        return data != null && ("DIST_STOCK_CONTRACT".equals(data.getType())
+                || "INTL_INVENTORY_AGMT".equals(data.getType()));
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "新增合同，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增合同，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override

@@ -409,6 +409,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
             List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList();
             List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList();
             if (CollectionUtils.isNotEmpty(afterChangeSpecList)) {
             if (CollectionUtils.isNotEmpty(afterChangeSpecList)) {
                 orderInfo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
                 orderInfo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
+                orderInfo.setType(purchaseOrderInfo.getType());
                 for (PurchaseOrderLine line : afterChangeSpecList) {
                 for (PurchaseOrderLine line : afterChangeSpecList) {
                     createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null
                     createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null
                             , purchaseOrderInfo.getContractCreateById());
                             , purchaseOrderInfo.getContractCreateById());
@@ -514,6 +515,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                                          PurchaseOrderInfo orderInfo, ContractDistributorStandard standard, String type1,
                                          PurchaseOrderInfo orderInfo, ContractDistributorStandard standard, String type1,
                                          String contractCreateById) {
                                          String contractCreateById) {
         CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
         CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
+        vo.setOrderingUnitName(orderDetailReport.getOrderingUnitName());
         if ("offset".equals(type1)) {
         if ("offset".equals(type1)) {
             vo.setPurchaseOrderLineId(line.getId());
             vo.setPurchaseOrderLineId(line.getId());
             vo.setQuantity(line.getQuantity().negate());
             vo.setQuantity(line.getQuantity().negate());
@@ -524,13 +526,13 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 vo.setPurchaseOrderLineId(line.getId());
                 vo.setPurchaseOrderLineId(line.getId());
             }
             }
             vo.setQuantity(line.getQuantity());
             vo.setQuantity(line.getQuantity());
+            vo.setOrderingUnitName(orderInfo.getOrderingUnitName());
         }
         }
         vo.setOrderNo(orderDetailReport.getOrderNo());
         vo.setOrderNo(orderDetailReport.getOrderNo());
         vo.setOrderDate(orderDetailReport.getOrderDate());
         vo.setOrderDate(orderDetailReport.getOrderDate());
         vo.setWorkshopId(orderDetailReport.getWorkshopId());
         vo.setWorkshopId(orderDetailReport.getWorkshopId());
         vo.setDeptName(orderDetailReport.getDeptName());
         vo.setDeptName(orderDetailReport.getDeptName());
         vo.setRegionName(orderDetailReport.getRegionName());
         vo.setRegionName(orderDetailReport.getRegionName());
-        vo.setOrderingUnitName(orderDetailReport.getOrderingUnitName());
         vo.setIndustry(line.getIndustry());
         vo.setIndustry(line.getIndustry());
         vo.setBrand(line.getBrand());
         vo.setBrand(line.getBrand());
         vo.setThickness(line.getThickness());
         vo.setThickness(line.getThickness());