Browse Source

Merge remote-tracking branch 'origin/master'

caozj 1 year ago
parent
commit
1ef11b6063

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

@@ -134,7 +134,6 @@ public class ContractFlow extends FlowDelegate {
         if (CollectionUtils.isNotEmpty(contractProductList)) {
         if (CollectionUtils.isNotEmpty(contractProductList)) {
             for (ContractProduct c : contractProductList) {
             for (ContractProduct c : contractProductList) {
                 c.setContractId(contract.getId());
                 c.setContractId(contract.getId());
-//                ObsFileUtil.saveFile(c.getFileList(), c.getId());
             }
             }
             contractProductService.saveOrUpdateBatch(contractProductList);
             contractProductService.saveOrUpdateBatch(contractProductList);
         }
         }

+ 0 - 1
hx-sale/src/main/java/com/fjhx/sale/flow/EhsdPurchaseFlow.java

@@ -238,7 +238,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
                     purchaseProductMountingsList.forEach(obj -> obj.setPurchaseProductId(id));
                     purchaseProductMountingsList.forEach(obj -> obj.setPurchaseProductId(id));
                     addMountingsList.addAll(purchaseProductMountingsList);
                     addMountingsList.addAll(purchaseProductMountingsList);
                 }
                 }
-                ObsFileUtil.saveFile(s.getFileList(), s.getId());
 
 
                 if ("0".equals(purchase.getDataResource())) {
                 if ("0".equals(purchase.getDataResource())) {
                     //计算采购数量是否大于申购数量
                     //计算采购数量是否大于申购数量

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

@@ -140,7 +140,6 @@ public class SampleFlow extends FlowDelegate {
                 c.setId(IdWorker.getId());
                 c.setId(IdWorker.getId());
                 c.setSampleId(sample.getId());
                 c.setSampleId(sample.getId());
                 c.setExpendQuantity(c.getQuantity());
                 c.setExpendQuantity(c.getQuantity());
-                ObsFileUtil.saveFile(c.getFileList(),c.getId());
             }
             }
             sampleProductService.saveOrUpdateBatch(sampleProductList);
             sampleProductService.saveOrUpdateBatch(sampleProductList);
         }
         }