样品单、交接单变更逻辑更改.增加流程回退、驳回

hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimController.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.controller.claim;
 
+import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.sale.entity.claim.po.Claim;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.fjhx.sale.entity.claim.vo.ClaimContractVo;

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

@@ -137,7 +137,6 @@ public class SampleFlow extends FlowDelegate {
         List<SampleProduct> sampleProductList = sample.getSampleProductList();
         if(CollectionUtils.isNotEmpty(sampleProductList)){//保存样品单产品
             for(SampleProduct c : sampleProductList){
-                c.setId(IdWorker.getId());
                 c.setSampleId(sample.getId());
                 c.setExpendQuantity(c.getQuantity());
             }
@@ -146,7 +145,6 @@ public class SampleFlow extends FlowDelegate {
         List<SampleProject> sampleProjectList = sample.getSampleProjectList();
         if(CollectionUtils.isNotEmpty(sampleProjectList)){//保存收费项目
             for(SampleProject c : sampleProjectList){
-                c.setId(IdWorker.getId());
                 c.setSampleId(sample.getId());
             }
             sampleProjectService.saveOrUpdateBatch(sampleProjectList);
@@ -154,7 +152,6 @@ public class SampleFlow extends FlowDelegate {
         List<SampleShipment> sampleShipmentList = sample.getSampleShipmentList();
         if(CollectionUtils.isNotEmpty(sampleShipmentList)){//保存自定义出货
             for(SampleShipment c : sampleShipmentList){
-                c.setId(IdWorker.getId());
                 c.setSampleId(sample.getId());
             }
             sampleShipmentService.saveOrUpdateBatch(sampleShipmentList);