Merge branch 'master_after0506' into master_after0506_0626

# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractDistributorStandardBo.java
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/QueryContractDistributorStandardBo.java
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ContractDistributorStandard.java
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java

@@ -504,12 +504,6 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private Boolean canCreateChange;
     private Boolean canCreateChange;
 
 
     /**
     /**
-     * 是否可锁价
-     */
-    @ApiModelProperty(value = "是否可锁价")
-    private Boolean canPriceLock;
-
-    /**
      * 是否可锁规
      * 是否可锁规
      */
      */
     @ApiModelProperty(value = "是否可锁规")
     @ApiModelProperty(value = "是否可锁规")
@@ -522,6 +516,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     private Boolean canCreateSpecLockDelay;
     private Boolean canCreateSpecLockDelay;
 
 
     /**
     /**
+     * 是否可锁价
+     */
+    @ApiModelProperty(value = "是否可锁价")
+    private Boolean canPriceLock;
+
+    /**
      * 创建人
      * 创建人
      */
      */
     @ApiModelProperty(value = "创建人")
     @ApiModelProperty(value = "创建人")

@@ -277,12 +277,6 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private Boolean canCreateChange;
     private Boolean canCreateChange;
 
 
     /**
     /**
-     * 是否可锁价
-     */
-    @ApiModelProperty(value = "是否可锁价")
-    private Boolean canPriceLock;
-
-    /**
      * 是否可锁规
      * 是否可锁规
      */
      */
     @ApiModelProperty(value = "是否可锁规")
     @ApiModelProperty(value = "是否可锁规")
@@ -294,6 +288,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty(value = "是否可发起锁规延期申请")
     @ApiModelProperty(value = "是否可发起锁规延期申请")
     private Boolean canCreateSpecLockDelay;
     private Boolean canCreateSpecLockDelay;
 
 
+    /**
+     * 是否可锁价
+     */
+    @ApiModelProperty(value = "是否可锁价")
+    private Boolean canPriceLock;
+
 
 
     public QueryContractDistributorStandardBo() {
     public QueryContractDistributorStandardBo() {
 
 

 package com.lframework.xingyun.sc.bo.order;
 package com.lframework.xingyun.sc.bo.order;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 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;
@@ -7,6 +8,7 @@ import com.lframework.starter.web.core.bo.BaseBo;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 
 
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
@@ -350,6 +352,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     @ApiModelProperty("是否展示上传按钮")
     @ApiModelProperty("是否展示上传按钮")
     private boolean showUpload = false;
     private boolean showUpload = false;
 
 
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
 
 
     public GetPurchaseOrderInfoBo() {
     public GetPurchaseOrderInfoBo() {
 
 

@@ -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()

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

@@ -224,7 +224,8 @@ public class ContractDistributorStandardServiceImpl extends
     public List<ContractDistributorStandard> query(QueryContractDistributorStandardVo vo) {
     public List<ContractDistributorStandard> query(QueryContractDistributorStandardVo vo) {
 
 
         List<ContractDistributorStandard> datas = getBaseMapper().query(vo);
         List<ContractDistributorStandard> datas = getBaseMapper().query(vo);
-        CollectionUtils.emptyIfNull(datas).forEach(this::fillContractOperationPermissions);
+        CollectionUtils.emptyIfNull(datas).forEach(data -> data.setCanSplit(isCanSplit(data)));
+        fillCanPriceLock(datas);
         return datas;
         return datas;
     }
     }
 
 
@@ -245,7 +246,7 @@ public class ContractDistributorStandardServiceImpl extends
         }
         }
         data.setCanEdit(canEdit);
         data.setCanEdit(canEdit);
         fillRemainingQuantity(data);
         fillRemainingQuantity(data);
-        fillContractOperationPermissions(data);
+        fillCanPriceLock(data);
 
 
         // 获取当前人员的待办任务数据
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
@@ -316,50 +317,43 @@ public class ContractDistributorStandardServiceImpl extends
     }
     }
 
 
     /**
     /**
-     * 填充合同操作权限字段
+     * 批量回填是否可锁价
      *
      *
-     * @param data 合同
+     * @param datas 合同列表
      */
      */
-    private void fillContractOperationPermissions(ContractDistributorStandard data) {
-        if (data == null) {
+    private void fillCanPriceLock(List<ContractDistributorStandard> datas) {
+        if (CollectionUtils.isEmpty(datas)) {
             return;
             return;
         }
         }
-        data.setCanSplit(isCanSplit(data));
-        data.setCanCreateChange(isCanCreateChange(data));
-        data.setCanPriceLock(isCanPriceLock(data));
-        data.setCanSpecLock(isCanSpecLock(data));
-        data.setCanCreateSpecLockDelay(isCanCreateSpecLockDelay(data));
+
+        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 合同
      * @param data 合同
-     * @return 是否可发起合同变更
      */
      */
-    private boolean isCanCreateChange(ContractDistributorStandard data) {
-        if (data == null || StringUtils.isBlank(data.getType()) || StringUtils.isBlank(data.getStatus())) {
-            return false;
-        }
-        if (hasUnfinishedContractChange(data) || hasUnfinishedSpecLockDelay(data)) {
-            return false;
-        }
-        if ("DISTRIB_STD".equals(data.getType())
-                || "DRAFT_DIST_AGMT".equals(data.getType())
-                || "INTL_STD_CONTRACT".equals(data.getType())
-                || "INTL_OPEN_SPEC_AGMT".equals(data.getType())
-                || "PROCESS_STD_AGMT".equals(data.getType())) {
-            return "STANDARD".equals(data.getStatus()) && CustomerDevelopStatus.PASS.name().equals(data.getStandardApproved());
-        }
-        if ("DIST_STOCK_CONTRACT".equals(data.getType()) || "INTL_INVENTORY_AGMT".equals(data.getType())) {
-            if ("FORMAL".equals(data.getStatus())) {
-                return CustomerDevelopStatus.PASS.name().equals(data.getFormalApproved());
-            }
-            if ("STANDARD".equals(data.getStatus())) {
-                return CustomerDevelopStatus.PASS.name().equals(data.getStandardApproved());
-            }
+    private void fillCanPriceLock(ContractDistributorStandard data) {
+        if (data == null || StringUtils.isBlank(data.getId())) {
+            return;
         }
         }
-        return false;
+
+        data.setCanPriceLock(isCanPriceLock(data));
     }
     }
 
 
     /**
     /**
@@ -369,111 +363,24 @@ public class ContractDistributorStandardServiceImpl extends
      * @return 是否可锁价
      * @return 是否可锁价
      */
      */
     private boolean isCanPriceLock(ContractDistributorStandard data) {
     private boolean isCanPriceLock(ContractDistributorStandard data) {
-        if (data == null) {
-            return false;
-        }
-        if (!"DIST_STOCK_CONTRACT".equals(data.getType()) && !"INTL_INVENTORY_AGMT".equals(data.getType())) {
-            return false;
-        }
-        if (!"FORMAL".equals(data.getStatus())) {
-            return false;
-        }
-        if (!CustomerDevelopStatus.PASS.name().equals(data.getFormalApproved())) {
-            return false;
-        }
-        if (Boolean.TRUE.equals(data.getPriceSpecLocked())) {
-            return false;
-        }
-        if (hasUnfinishedContractChange(data)) {
-            return false;
-        }
-        Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
-                .eq(PurchaseOrderInfo::getContractId, data.getId())
-                .eq(PurchaseOrderInfo::getType, "PRODUCTION")
-                .eq(PurchaseOrderInfo::getExamineStatus, CustomerDevelopStatus.PASS.name());
-        return purchaseOrderInfoService.count(orderInfoWrapper) > 0;
-    }
-
-    /**
-     * 判断是否可锁规
-     *
-     * @param data 合同
-     * @return 是否可锁规
-     */
-    private boolean isCanSpecLock(ContractDistributorStandard data) {
-        if (data == null) {
-            return false;
-        }
-        if (!"DRAFT_DIST_AGMT".equals(data.getType()) && !"INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
-            return false;
-        }
-        if (!"STANDARD".equals(data.getStatus())) {
-            return false;
-        }
-        if (!CustomerDevelopStatus.PASS.name().equals(data.getStandardApproved())) {
+        if (!isInventoryContract(data)) {
             return false;
             return false;
         }
         }
         if (Boolean.TRUE.equals(data.getPriceSpecLocked())) {
         if (Boolean.TRUE.equals(data.getPriceSpecLocked())) {
             return false;
             return false;
         }
         }
-        return !hasUnfinishedContractChange(data);
-    }
-
-    /**
-     * 判断是否可发起锁规延期申请
-     *
-     * @param data 合同
-     * @return 是否可发起锁规延期申请
-     */
-    private boolean isCanCreateSpecLockDelay(ContractDistributorStandard data) {
-        if (!isCanSpecLock(data)) {
-            return false;
-        }
-        return !hasUnfinishedSpecLockDelay(data);
-    }
-
-    /**
-     * 是否存在未结束的合同变更
-     *
-     * @param data 合同
-     * @return 是否存在未结束的合同变更
-     */
-    private boolean hasUnfinishedContractChange(ContractDistributorStandard data) {
-        if (data == null) {
-            return false;
-        }
-        String rootContractId = StringUtils.isBlank(data.getParentId()) ? data.getId() : data.getParentId();
-        return contractChangeApplicationService.hasUnfinishedApplication(rootContractId);
+        return true;
     }
     }
 
 
     /**
     /**
-     * 是否存在未结束的锁规延期申请
+     * 判断是否为库存合同
      *
      *
      * @param data 合同
      * @param data 合同
-     * @return 是否存在未结束的锁规延期申请
+     * @return 是否为库存合同
      */
      */
-    private boolean hasUnfinishedSpecLockDelay(ContractDistributorStandard data) {
-        if (data == null) {
-            return false;
-        }
-        String rootContractId = StringUtils.isBlank(data.getParentId()) ? data.getId() : data.getParentId();
-        Wrapper<ContractDistributorStandard> contractWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
-                .select(ContractDistributorStandard::getId)
-                .eq(ContractDistributorStandard::getId, rootContractId)
-                .or()
-                .eq(ContractDistributorStandard::getParentId, rootContractId);
-        List<String> contractIds = CollectionUtils.emptyIfNull(getBaseMapper().selectList(contractWrapper))
-                .stream()
-                .map(ContractDistributorStandard::getId)
-                .collect(Collectors.toList());
-        if (!contractIds.contains(rootContractId)) {
-            contractIds.add(rootContractId);
-        }
-        Wrapper<SpecLockDelayApplication> wrapper = Wrappers.lambdaQuery(SpecLockDelayApplication.class)
-                .in(SpecLockDelayApplication::getContractId, contractIds)
-                .notIn(SpecLockDelayApplication::getApprovalStatus,
-                        Arrays.asList(CustomerDevelopStatus.PASS.name(), CustomerDevelopStatus.CANCEL.name()));
-        return specLockDelayApplicationMapper.selectCount(wrapper) > 0;
+    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"})
@@ -1459,9 +1366,6 @@ public class ContractDistributorStandardServiceImpl extends
         if (ObjectUtil.isNull(data)) {
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("合同不存在！");
             throw new DefaultClientException("合同不存在！");
         }
         }
-        if (!isCanPriceLock(data)) {
-            throw new DefaultClientException("当前合同存在未结束的合同变更流程，或未满足锁价条件，不允许锁价！");
-        }
 
 
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         if (CollectionUtils.isEmpty(lineVoList)) {
         if (CollectionUtils.isEmpty(lineVoList)) {
@@ -1590,9 +1494,6 @@ public class ContractDistributorStandardServiceImpl extends
         if (ObjectUtil.isNull(data)) {
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("合同不存在！");
             throw new DefaultClientException("合同不存在！");
         }
         }
-        if (!isCanSpecLock(data)) {
-            throw new DefaultClientException("当前合同存在未结束的合同变更流程，或未满足锁规条件，不允许锁规！");
-        }
 
 
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
         if (CollectionUtils.isEmpty(lineVoList)) {
         if (CollectionUtils.isEmpty(lineVoList)) {

@@ -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());

@@ -168,4 +168,11 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
      */
      */
     @ApiModelProperty("导出类型")
     @ApiModelProperty("导出类型")
     private String templateType;
     private String templateType;
+
+    /**
+     * 操作时间
+     */
+    @ApiModelProperty("操作时间")
+    private String createTimeStart;
+    private String createTimeEnd;
 }
 }

@@ -204,6 +204,14 @@
                     #{id}
                     #{id}
                 </foreach>
                 </foreach>
             </if>
             </if>
+            <if test="vo.createTimeStart != null">
+                AND tb.create_time >= #{vo.createTimeStart}
+            </if>
+            <if test="vo.createTimeEnd != null">
+                <![CDATA[
+                  AND tb.create_time < DATE_ADD(#{vo.createTimeEnd}, INTERVAL 1 DAY)
+                ]]>
+            </if>
         </where>
         </where>
         ORDER BY tb.create_time DESC
         ORDER BY tb.create_time DESC
     </select>
     </select>