[CODE]: 区分 仓储费、作业费

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementStorageController.java

@@ -72,9 +72,10 @@ public class TWarehouseAgreementStorageController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestParam("agreement") String agreement,
                           @RequestParam("agreementitems") String agreementitems) {
+        int fFeetypeid = 0;
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehouseAgreementService.insertTWarehouseAgreement(agreement,agreementitems,loginUser);
+        return tWarehouseAgreementService.insertTWarehouseAgreement(agreement,agreementitems,loginUser,fFeetypeid);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementTaskController.java

@@ -72,9 +72,10 @@ public class TWarehouseAgreementTaskController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestParam("agreement") String agreement,
                           @RequestParam("agreementitems") String agreementitems) {
+        int fFeetypeid = 1;
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehouseAgreementService.insertTWarehouseAgreement(agreement,agreementitems,loginUser);
+        return tWarehouseAgreementService.insertTWarehouseAgreement(agreement,agreementitems,loginUser,fFeetypeid);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseAgreementService.java

@@ -41,7 +41,7 @@ public interface ITWarehouseAgreementService {
      * @param loginUser
      * @return
      */
-    public AjaxResult insertTWarehouseAgreement(String agreement, String agreementitems, LoginUser loginUser);
+    public AjaxResult insertTWarehouseAgreement(String agreement, String agreementitems, LoginUser loginUser,int fFeetypeid);
 
     /**
      * 修改仓储费

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseAgreementServiceImpl.java

@@ -165,7 +165,7 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
      * @return
      */
     @Override
-    public AjaxResult insertTWarehouseAgreement(String agreement, String agreementitems, LoginUser loginUser) {
+    public AjaxResult insertTWarehouseAgreement(String agreement, String agreementitems, LoginUser loginUser,int fFeetypeid) {
         Long fPid = null;
         TWarehouseAgreement tWarehouseAgreement = JSONArray.parseObject(agreement, TWarehouseAgreement.class);
         if(StringUtils.isNull(tWarehouseAgreement.getfId())){
@@ -176,6 +176,7 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
             tWarehouseAgreement.setfBillno(billNo);
             tWarehouseAgreement.setCreateBy(loginUser.getUser().getUserName());
             tWarehouseAgreement.setfDeptid(loginUser.getUser().getDeptId());
+            tWarehouseAgreement.setfFeetypeid((long) fFeetypeid);
             tWarehouseAgreementMapper.insertTWarehouseAgreement(tWarehouseAgreement);
             fPid = tWarehouseAgreement.getfId();
         }else{