样品单、交接单变更逻辑更改

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

@@ -169,7 +169,7 @@ public class ContractUpdateFlow extends FlowDelegate {
         newContract.setId(oldContractId);//id赋值为旧合同的id
         newContract.setStatus(FlowStatusEnum1.PASS.getKey());
         newContract.setApprovedDate(new Date());
-        newContract.setUpId(businessId);
+        newContract.setUpId(temNewId);
         contractService.updateContract(newContract);
         //修改合同产品相关数据
         contractProductService.update(Wrappers.<ContractProduct>update().lambda().set(ContractProduct::getContractId,oldContractId).eq(ContractProduct::getContractId,businessId));
@@ -183,7 +183,7 @@ public class ContractUpdateFlow extends FlowDelegate {
         oldContract.setId(businessId);
         oldContract.setStatus(FlowStatusEnum1.UPDATE.getKey());
         oldContract.setIsChange("1");
-        newContract.setUpId(oldContractId);
+        newContract.setUpId(temOldId);
         contractService.updateContract(oldContract);
         //修改合同产品相关数据
         contractProductService.update(Wrappers.<ContractProduct>update().lambda().set(ContractProduct::getContractId,businessId).eq(ContractProduct::getContractId,oldContractId));

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

@@ -162,7 +162,7 @@ public class SampleUpdateFlow extends FlowDelegate {
         newSample.setId(oldSampleId);//id赋值为旧样品单的id
         newSample.setStatus(FlowStatusEnum1.PASS.getKey());
         newSample.setApprovedDate(new Date());
-        newSample.setUpId(businessId);
+        newSample.setUpId(temNewId);
         sampleService.updateSample(newSample);
         //修改样品单产品相关数据
         sampleProductService.update(Wrappers.<SampleProduct>update().lambda().set(SampleProduct::getSampleId,oldSampleId).eq(SampleProduct::getSampleId,businessId));
@@ -176,7 +176,7 @@ public class SampleUpdateFlow extends FlowDelegate {
         oldSample.setId(businessId);
         oldSample.setStatus(FlowStatusEnum1.UPDATE.getKey());
         oldSample.setIsChange("1");
-        oldSample.setUpId(oldSampleId);
+        oldSample.setUpId(temOldId);
         sampleService.updateSample(oldSample);
         //修改样品单产品相关数据
         sampleProductService.update(Wrappers.<SampleProduct>update().lambda().set(SampleProduct::getSampleId,businessId).eq(SampleProduct::getSampleId,oldSampleId));