Merge branch 'master_after20' into master_cj_zq

@@ -49,6 +49,12 @@ public class GetContractStdProcessingLineBo extends BaseBo<ContractStdProcessing
     private String rawProductGrade;
 
     /**
+     * 原材料牌号名称
+     */
+    @ApiModelProperty("原材料牌号")
+    private String rawProductGradeName;
+
+    /**
      * 行业
      */
     @ApiModelProperty("行业")

@@ -118,6 +118,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
     public static final String APPLICABLE_STANDARD_DIC_CODE = "APPLICABLE_STANDARD"; // 执行标准
     public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
     public static final String RAW_TO_PROD_RATIO_DIC_CODE = "RAW_TO_PROD_RATIO"; // 原材料与产品数量比
+    public static final String RAW_MATERIAL = "RAW_MATERIAL"; // 原材料
+    public static final String RAW_MATERIAL_GRADE = "RAW_MATERIAL_GRADE"; // 原材料牌号
 
     /**
      * 查询列表
@@ -390,12 +392,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
             List<GetContractStdProcessingLineBo> lineBoList = new ArrayList<>(contractStdProcessingLineList.size());
             List<SysDataDicItem> rawToProdRatioDiciItemList = sysDataDicItemService.findByDicCode(RAW_TO_PROD_RATIO_DIC_CODE);
             Map<String, String> rawToProdRatioCodeAndNameMap = rawToProdRatioDiciItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+            List<SysDataDicItem> rawMaterialDiciItemList = sysDataDicItemService.findByDicCode(RAW_MATERIAL);
+            Map<String, String> rawMaterialCodeAndNameMap = rawMaterialDiciItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
+            List<SysDataDicItem> rawProductGradeDiciItemList = sysDataDicItemService.findByDicCode(RAW_MATERIAL_GRADE);
+            Map<String, String> rawProductGradeCodeAndNameMap = rawProductGradeDiciItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
             contractStdProcessingLineList.forEach(contractStdProcessingLine -> {
                 GetContractStdProcessingLineBo contractStdProcessingLineBo = new GetContractStdProcessingLineBo(contractStdProcessingLine);
-                String rawProductName = productCodeAndNameMap.get(contractStdProcessingLineBo.getRawProductId());
+                String rawProductName = rawMaterialCodeAndNameMap.get(contractStdProcessingLineBo.getRawProductId());
+                String rawProductGradeName = rawProductGradeCodeAndNameMap.get(contractStdProcessingLineBo.getRawProductGrade());
                 String productName = productCodeAndNameMap.get(contractStdProcessingLineBo.getProductId());
                 String materialProductRatioName = rawToProdRatioCodeAndNameMap.get(contractStdProcessingLineBo.getMaterialProductRatio());
                 contractStdProcessingLineBo.setRawProductName(rawProductName);
+                contractStdProcessingLineBo.setRawProductGradeName(rawProductGradeName);
                 contractStdProcessingLineBo.setProductName(productName);
                 contractStdProcessingLineBo.setMaterialProductRatioName(materialProductRatioName);
                 lineBoList.add(contractStdProcessingLineBo);
@@ -1144,7 +1152,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                     if (CollectionUtils.isNotEmpty(data.getContractStdProcessingLineList())) {
                         startRow++;
                         for (GetContractStdProcessingLineBo line : data.getContractStdProcessingLineList()) {
-                            setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGrade());
+                            setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGradeName());
                             setCellValue(sheet, startRow, 4, line.getSupplyTime());
                             if ("其它".equals(line.getMaterialProductRatioName())) {
                                 setCellValue(sheet, startRow, 5, line.getMaterialProductRatioName() + "|" + line.getMaterialProductRatioRemarks());

@@ -62,7 +62,6 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         return getBaseMapper().query(vo);
     }
 
-    @Cacheable(value = ContractFramework.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     public ContractFramework findById(String id) {
 
@@ -77,6 +76,19 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("合同框架不存在！");
         }
+        QueryContractFrameworkVo vo1 = new QueryContractFrameworkVo();
+        vo1.setCustomerId(vo.getCustomerId());
+        vo1.setCompany(vo.getCompany());
+        vo1.setMaterialTypeId(vo.getMaterialTypeId());
+        List<ContractFramework> query = this.query(vo1);
+        if (CollectionUtils.isNotEmpty(query)) {
+            // 过滤掉当前 ID 的记录，看是否还有其他记录
+            boolean hasOtherRecords = query.stream()
+                    .anyMatch(item -> !item.getId().equals(vo.getId()));
+            if (hasOtherRecords) {
+                throw new DefaultClientException("已经存在相同的框架合同！");
+            }
+        }
 
         LambdaUpdateWrapper<ContractFramework> updateWrapper = Wrappers.lambdaUpdate(ContractFramework.class)
                 .set(ContractFramework::getCode, vo.getCode())
@@ -97,7 +109,14 @@ public class ContractFrameworkServiceImpl extends BaseMpServiceImpl<ContractFram
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(CreateContractFrameworkVo vo) {
-
+        QueryContractFrameworkVo vo1 = new QueryContractFrameworkVo();
+        vo1.setCustomerId(vo.getCustomerId());
+        vo1.setCompany(vo.getCompany());
+        vo1.setMaterialTypeId(vo.getMaterialTypeId());
+        List<ContractFramework> query = this.query(vo1);
+        if (CollectionUtils.isNotEmpty(query)) {
+            throw new DefaultClientException("已经存在相同的框架合同！");
+        }
         ContractFramework data = new ContractFramework();
         data.setId(IdUtil.getId());
         data.setCode(vo.getCode());

@@ -44,6 +44,7 @@ import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
@@ -471,7 +472,39 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             return;
         }
         List<String> orderIds = detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
-        purchaseOrderInfoService.updateStatus(orderIds, "DELIVERED");
+        // 获取订货单规格数据
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(orderIds, true);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            return;
+        }
+        // 按照订货单分组
+        Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
+        for (PurchaseOrderLine orderLine : orderLineList) {
+            String orderId = orderLine.getPurchaseOrderId();
+            List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+            list.add(orderLine);
+        }
+        List<String> needDeliveryOrderIds = new ArrayList<>();
+        for (String orderId : orderIds) {
+            List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
+            if (CollectionUtils.isEmpty(lineList)) {
+                log.info("========================== 订货单 {} 不存在规格数据！", orderId);
+                continue;
+            }
+            boolean needDelivery = true;
+            for (PurchaseOrderLine line : lineList) {
+                Boolean shipment = line.getShipment();
+                if (!BooleanUtils.isTrue(shipment)) {
+                    needDelivery = false;
+                    break;
+                }
+            }
+            if (needDelivery) {
+                needDeliveryOrderIds.add(orderId);
+            }
+        }
+
+        purchaseOrderInfoService.updateStatus(needDeliveryOrderIds, "DELIVERED");
     }
 
     @Override

@@ -186,40 +186,49 @@
                 AND tb.standard_approved = #{vo.standardApproved}
             </if>
             <if test="vo.workshopIdList != null and vo.workshopIdList.size() > 0">
-                OR tb.workshop_id IN
+                AND tb.workshop_id IN
                 <foreach collection="vo.workshopIdList" open="(" separator="," close=")" item="item">
                     #{item}
                 </foreach>
             </if>
-            <choose>
-                <when test="vo.contractIdList != null and vo.contractIdList.size() > 0">
-                AND (tb.id IN
-                    <foreach collection="vo.contractIdList" open="(" separator="," close=")" item="item">
-                        #{item}
-                    </foreach>
-                    <if test="vo.createById != null and vo.createById != ''">
-                        OR tb.create_by_id = #{vo.createById}
-                    </if>
-                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">
-                        OR tb.create_by_id IN
-                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">
-                            #{item}
-                        </foreach>
-                    </if>
-                    )
-                </when>
-                <otherwise>
-                    <if test="vo.createById != null and vo.createById != ''">
-                        AND tb.create_by_id = #{vo.createById}
-                    </if>
-                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">
-                        AND tb.create_by_id IN
-                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">
-                            #{item}
-                        </foreach>
-                    </if>
-                </otherwise>
-            </choose>
+            <if test="vo.createById != null and vo.createById != ''">
+                AND tb.create_by_id = #{vo.createById}
+            </if>
+            <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">
+                AND tb.create_by_id IN
+                <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+<!--            <choose>-->
+<!--                <when test="vo.contractIdList != null and vo.contractIdList.size() > 0">-->
+<!--                AND (tb.id IN-->
+<!--                    <foreach collection="vo.contractIdList" open="(" separator="," close=")" item="item">-->
+<!--                        #{item}-->
+<!--                    </foreach>-->
+<!--                    <if test="vo.createById != null and vo.createById != ''">-->
+<!--                        OR tb.create_by_id = #{vo.createById}-->
+<!--                    </if>-->
+<!--                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">-->
+<!--                        OR tb.create_by_id IN-->
+<!--                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">-->
+<!--                            #{item}-->
+<!--                        </foreach>-->
+<!--                    </if>-->
+<!--                    )-->
+<!--                </when>-->
+<!--                <otherwise>-->
+<!--                    <if test="vo.createById != null and vo.createById != ''">-->
+<!--                        AND tb.create_by_id = #{vo.createById}-->
+<!--                    </if>-->
+<!--                    <if test="vo.createByIdList != null and vo.createByIdList.size() > 0">-->
+<!--                        AND tb.create_by_id IN-->
+<!--                        <foreach collection="vo.createByIdList" open="(" separator="," close=")" item="item">-->
+<!--                            #{item}-->
+<!--                        </foreach>-->
+<!--                    </if>-->
+<!--                </otherwise>-->
+<!--            </choose>-->
         </where>
         order by tb.create_time desc
     </select>