1：锁规合同编码+_01；2：库存合同新增筛选条件“锁价状态”；3：未锁规合同新增筛选条件“锁规状态”

@@ -1418,8 +1418,11 @@ public class ContractDistributorStandardServiceImpl extends
 
         // 判断锁规是否完成（锁规数量等于合同数量）
         boolean checkPriceSpecLocked = allChildTotalQuantity.compareTo(data.getTotalQuantity()) == 0;
+        int lockBatchNo = childContractList.size() + 1;
+        String lockContractCode = buildSpecificationLockContractCode(data.getCode(), data.getType(), lockBatchNo);
 
         data.setId(IdUtil.getUUID());
+        data.setCode(lockContractCode);
         data.setTotalQuantity(vo.getTotalQuantity());
         data.setTotalAmountCapital(vo.getTotalAmountCapital());
         data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
@@ -1479,6 +1482,19 @@ public class ContractDistributorStandardServiceImpl extends
 //        createPurchaseOrderInfo(data, "PRODUCTION");
     }
 
+    private String buildSpecificationLockContractCode(String contractCode, String contractType, int lockBatchNo) {
+        if (!isOpenSpecContract(contractType) || StringUtils.isBlank(contractCode)) {
+            return contractCode;
+        }
+
+        String normalizedCode = contractCode.replaceFirst("_[0-9]{2}$", "");
+        return normalizedCode + "_" + String.format("%02d", lockBatchNo);
+    }
+
+    private boolean isOpenSpecContract(String contractType) {
+        return "DRAFT_DIST_AGMT".equals(contractType) || "INTL_OPEN_SPEC_AGMT".equals(contractType);
+    }
+
     public List<String> getNoContractSigned(List<String> buyerList) {
         return getBaseMapper().getNoContractSigned(buyerList);
     }

@@ -95,5 +95,11 @@ public class QueryContractDistributorStandardVo extends PageVo implements BaseVo
     @ApiModelProperty("生产厂ID集合")
     private List<String> workshopIdList;
 
+    @ApiModelProperty("锁规状态：UNLOCKED-未锁规，PARTIAL-部分锁规，LOCKED-已锁规")
+    private String specLockStatus;
+
+    @ApiModelProperty("锁价状态：UNLOCKED-未锁价，LOCKED-已锁价")
+    private String lockedPriceStatus;
+
 }
 

@@ -195,6 +195,41 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="vo.specLockStatus != null and vo.specLockStatus != ''">
+                AND tb.type IN ('DRAFT_DIST_AGMT', 'INTL_OPEN_SPEC_AGMT')
+                <choose>
+                    <when test="vo.specLockStatus == 'UNLOCKED'">
+                        AND (tb.price_spec_locked = 0 OR tb.price_spec_locked IS NULL)
+                        AND NOT EXISTS (
+                        SELECT 1
+                        FROM tbl_contract_distributor_standard child
+                        WHERE child.parent_id = tb.id
+                        )
+                    </when>
+                    <when test="vo.specLockStatus == 'PARTIAL'">
+                        AND (tb.price_spec_locked = 0 OR tb.price_spec_locked IS NULL)
+                        AND EXISTS (
+                        SELECT 1
+                        FROM tbl_contract_distributor_standard child
+                        WHERE child.parent_id = tb.id
+                        )
+                    </when>
+                    <when test="vo.specLockStatus == 'LOCKED'">
+                        AND tb.price_spec_locked = 1
+                    </when>
+                </choose>
+            </if>
+            <if test="vo.lockedPriceStatus != null and vo.lockedPriceStatus != ''">
+                AND tb.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT')
+                <choose>
+                    <when test="vo.lockedPriceStatus == 'LOCKED'">
+                        AND tb.price_spec_locked = 1
+                    </when>
+                    <when test="vo.lockedPriceStatus == 'UNLOCKED'">
+                        AND (tb.price_spec_locked = 0 OR tb.price_spec_locked IS NULL)
+                    </when>
+                </choose>
+            </if>
             <if test="vo.createById != null and vo.createById != ''">
                 AND tb.create_by_id = #{vo.createById}
             </if>