样品单合同旧合同ID逻辑更改

hx-sale/src/main/java/com/fjhx/sale/entity/sale/vo/SaleQuotationVo.java

@@ -57,7 +57,7 @@ public class SaleQuotationVo extends SaleQuotation {
     /**
      * 客户标签
      */
-    private String customerTag;
+    private String tag;
 
     /**
      * 卖方公司名称

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -194,7 +194,6 @@ public class ContractUpdateFlow extends FlowDelegate {
         newContract.setStatus(FlowStatusEnum1.PASS.getKey());
         newContract.setApprovedDate(new Date());
         newContract.setUpId(temNewId);
-        newContract.setOldContractId(businessId);
         newContract.setIsShow(0);//显示新合同
         contractService.updateContract(newContract);
         //修改合同产品相关数据

hx-sale/src/main/java/com/fjhx/sale/flow/SampleUpdateFlow.java

@@ -179,7 +179,6 @@ public class SampleUpdateFlow extends FlowDelegate {
         newSample.setStatus(FlowStatusEnum1.PASS.getKey());
         newSample.setApprovedDate(new Date());
         newSample.setUpId(temNewId);
-        newSample.setOldSampleId(businessId);
         newSample.setIsShow(0);//显示新样品单
         sampleService.updateSample(newSample);
         //修改样品单产品相关数据

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -112,7 +112,7 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         // 赋值买方公司名称(客户)
         customerService.attributeAssign(saleQuotationVoList, SaleQuotationVo::getBuyCorporationId, (item, customer) -> {
             item.setBuyCorporationName(customer.getName());
-            item.setCustomerTag(customer.getTag());
+            item.setTag(customer.getTag());
         });
         // 赋值卖方公司名称
         corporationService.attributeAssign(saleQuotationVoList, SaleQuotationVo::getSellCorporationId, (item, corporation) -> {