合同：1、库存合同拆分-审核通过才可拆分；2、库存合同 锁价时可改物料编码

@@ -215,8 +215,7 @@ public class ContractDistributorStandardServiceImpl extends
     public List<ContractDistributorStandard> query(QueryContractDistributorStandardVo vo) {
 
         List<ContractDistributorStandard> datas = getBaseMapper().query(vo);
-        CollectionUtils.emptyIfNull(datas).forEach(data -> data.setCanSplit(isCanSplitByCode(data.getCode())
-                && !Boolean.TRUE.equals(data.getPriceSpecLocked())));
+        CollectionUtils.emptyIfNull(datas).forEach(data -> data.setCanSplit(isCanSplit(data)));
         return datas;
     }
 
@@ -227,7 +226,7 @@ public class ContractDistributorStandardServiceImpl extends
         if (data == null) {
             return null;
         }
-        data.setCanSplit(isCanSplitByCode(data.getCode()) && !Boolean.TRUE.equals(data.getPriceSpecLocked()));
+        data.setCanSplit(isCanSplit(data));
         Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
                 .eq(PurchaseOrderInfo::getContractId, data.getId());
         List<PurchaseOrderInfo> purchaseOrderInfoList = purchaseOrderInfoService.list(orderInfoWrapper);
@@ -293,6 +292,19 @@ public class ContractDistributorStandardServiceImpl extends
         return !code.matches(".*_\\d{2}$");
     }
 
+    private boolean isCanSplit(ContractDistributorStandard data) {
+        if (data == null) {
+            return false;
+        }
+        if (!isCanSplitByCode(data.getCode()) || Boolean.TRUE.equals(data.getPriceSpecLocked())) {
+            return false;
+        }
+        if ("FORMAL".equals(data.getStatus())) {
+            return "PASS".equals(data.getFormalApproved());
+        }
+        return true;
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "新增合同，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -1314,7 +1326,15 @@ public class ContractDistributorStandardServiceImpl extends
             contractDistributorLine.setAmountExcludingTax(lineVo.getAmountExcludingTax());
             contractDistributorLine.setTotalAmount(lineVo.getTotalAmount());
             contractDistributorLine.setDeliveryDate(lineVo.getDeliveryDate());
+            contractDistributorLine.setMaterialCode(lineVo.getMaterialCode());
             contractDistributorLineService.getBaseMapper().insert(contractDistributorLine);
+
+            //更新物料编码
+            Wrapper<ContractDistributorLine> contractDistributorLineWrapper = Wrappers.lambdaUpdate(ContractDistributorLine.class)
+                    .set(ContractDistributorLine::getMaterialCode, lineVo.getMaterialCode())
+                    .eq(ContractDistributorLine::getId, lineVo.getId());
+
+            contractDistributorLineService.update(contractDistributorLineWrapper);
         }
 
         Wrapper<ContractDistributorStandard> changeLocked = Wrappers.lambdaUpdate(ContractDistributorStandard.class)