添加 可由用户手动填写添加 其他收费项目

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/controller/PurchaseDocumentaryController.java

@@ -172,7 +172,7 @@ public class PurchaseDocumentaryController {
             try {
                 outputStream.write("预览pdf失败".getBytes(StandardCharsets.UTF_8));
             } catch (IOException ex) {
-                throw new RuntimeException(ex);
+                log.error("预览pdf失败"+ex.getMessage(),ex);
             }
         } finally {
             IoUtil.close(outputStream);

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -49,6 +49,8 @@ import com.fjhx.settlementofexchange.service.ISettlementOfExchangeService;
 import com.fjhx.shipment.entity.ShipmentPacking;
 import com.fjhx.shipmentdetailed.entity.ShipmentDetailed;
 import com.fjhx.shipmentdetailed.service.IShipmentDetailedService;
+import com.fjhx.standard.entity.ChargeProject;
+import com.fjhx.standard.service.IChargeProjectService;
 import com.fjhx.tracknode.entity.TrackNode;
 import com.fjhx.tracknode.enums.FunctionTypeEnum;
 import com.fjhx.tracknode.service.ITrackNodeService;
@@ -138,6 +140,9 @@ public class PurchaseContractServiceImpl extends BasicsServiceImpl<PurchaseContr
     @Autowired
     private IPaymentGoodsDetailsService iPaymentGoodsDetailsService;
 
+    @Autowired
+    private IChargeProjectService chargeProjectService;
+
 
     /**
      * 列表
@@ -373,6 +378,16 @@ public class PurchaseContractServiceImpl extends BasicsServiceImpl<PurchaseContr
                 // 此处ID设为null，是防止复制采购合同时把复制对象的ID携带过来
                 project.setId(IdWorker.getIdStr());
                 project.setPurchaseContractId(purchaseContract.getId());
+                //判断是否是用户手动添加的 收费项目
+                if(project.getProjectId().equals("")){
+                    //添加用户收费项目
+                    ChargeProject chargeProject = new ChargeProject();
+                    chargeProject.setRemarks(project.getRemark());
+                    chargeProject.setProject(project.getProjectName());
+                    chargeProject.setPrice(project.getProjectPrice());
+                    chargeProjectService.insert(chargeProject);
+                    project.setProjectId(chargeProject.getId());
+                }
             }
             iPurchaseContractProjectService.saveBatch(purchaseContract.getProjects());
         }