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

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

@@ -71,7 +71,6 @@ public class ContractFlow extends FlowDelegate {
         if(StringUtils.isEmpty(contract.getCurrency())){
             throw new ServiceException("币种不能为空");
         }
-        contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
 
         // 保存合同产品
@@ -120,6 +119,7 @@ public class ContractFlow extends FlowDelegate {
         contract.setBuyCityId(contract.getCityId());
         contract.setBuyCountryId(contract.getCountryId());
         contract.setBuyProvinceId(contract.getProvinceId());
+        contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
 //        contract.setRate(ExchangeRateUtil.getCnyToCodeRate(contract.getCurrency()));
         contractService.save(contract);
 

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

@@ -80,6 +80,9 @@ public class ContractUpdateFlow extends FlowDelegate {
         if(ObjectUtil.isEmpty(oldContract)){
             throw new ServiceException("查询不到原合同信息");
         }
+        //更新原样品单状态为变更中
+        oldContract.setStatus(FlowStatusEnum1.UPDATE_LOADING.getKey());
+        contractService.updateById(oldContract);
         //查询旧合同的订单产品
         List<ContractProduct> oldContractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, oldContractId));
         if(CollectionUtils.isEmpty(oldContractProductList)){
@@ -101,7 +104,6 @@ public class ContractUpdateFlow extends FlowDelegate {
             code = code.substring(0, code.lastIndexOf("("));
         }
         contract.setCode(code + "(" + index + ")");
-        contract.setStatus(FlowStatusEnum1.UPDATE_LOADING.getKey());
         /**
          * 计算新合同的剩余数量
          */

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

@@ -79,7 +79,6 @@ public class SampleFlow extends FlowDelegate {
 
         SampleDto sample = submitData.toJavaObject(SampleDto.class);
         sample.setCode(codingRuleService.createCode(CodingRuleEnum.SAMPLE.getKey(),sample.getBuyCorporationId()));
-        sample.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         long id = start(sample,0);
         return id;
     }
@@ -90,6 +89,7 @@ public class SampleFlow extends FlowDelegate {
         sample.setBuyCountryId(sample.getCountryId());
         sample.setBuyProvinceId(sample.getProvinceId());
 //        sample.setCode(CodeEnum.SAMPLE_CODE.getCode());
+        sample.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         sample.setUserName(SecurityUtils.getUsername());
 
         sampleService.save(sample);

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

@@ -73,6 +73,9 @@ public class SampleUpdateFlow extends FlowDelegate {
         if(ObjectUtil.isEmpty(oldSample)){
             throw new ServiceException("查询不到原样品单信息");
         }
+        //更新原样品单状态为变更中
+        oldSample.setStatus(FlowStatusEnum1.UPDATE_LOADING.getKey());
+        sampleService.updateById(oldSample);
         //查询旧样品单的订单产品
         List<SampleProduct> oldSampleProductList = sampleProductService.list(q -> q.eq(SampleProduct::getSampleId, oldSampleId));
         if(CollectionUtils.isEmpty(oldSampleProductList)){
@@ -94,7 +97,6 @@ public class SampleUpdateFlow extends FlowDelegate {
             code = code.substring(0, code.lastIndexOf("("));
         }
         newSample.setCode(code + "(" + index + ")");
-        newSample.setStatus(FlowStatusEnum1.UPDATE_LOADING.getKey());
         /**
          * 计算新样品单的剩余数量
          */