[CODE]: 财务确认更新主表ID

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -193,6 +193,7 @@ public class TFeeServiceImpl implements ITFeeService {
     @Override
     public AjaxResult insertTFeeTFeeDo(String tfee, String tfeeDo, LoginUser loginUser, String fBilltype) {
         Long fPid = null;
+        Map<String, Object> map = new HashMap<>();
         TFee tFee = JSONArray.parseObject(tfee, TFee.class);
         if (StringUtils.isNull(tFee.getfId())) {
             // 如果是新数据
@@ -223,7 +224,8 @@ public class TFeeServiceImpl implements ITFeeService {
                 tFeeDoMapper.insertTFeeDo(tFeeDo);
             }
         }
-        return AjaxResult.success();
+        map.put("tFee", tFee);
+        return AjaxResult.success("成功", map);
     }
 
     /**
@@ -307,13 +309,24 @@ public class TFeeServiceImpl implements ITFeeService {
     @Override
     @Transactional
     public AjaxResult confirm(String tfee, String tfeeDo, LoginUser loginUser, String fBilltype) {
-        // 更新 主表、从表
+
         TFee tFee = JSONArray.parseObject(tfee, TFee.class);
-        tFee.setUpdateBy(loginUser.getUser().getUserName());
-        tFee.setUpdateTime(new Date());
-        tFeeMapper.updateTFee(tFee);
-        // 删除从表
-        tFeeDoMapper.deleteByFPid(tFee.getfId());
+        if (StringUtils.isNull(tFee.getfId())) {
+            // 如果是新数据
+            tFee.setCreateBy(loginUser.getUser().getUserName());
+            tFee.setfBilltype(fBilltype);
+            // 业务编码
+            Date time = new Date();
+            String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
+            tFee.setfBillno(billNo);
+            tFeeMapper.insertTFee(tFee);
+        } else {
+            tFee.setUpdateBy(loginUser.getUser().getUserName());
+            tFee.setUpdateTime(new Date());
+            tFeeMapper.updateTFee(tFee);
+            // 删除从表
+            tFeeDoMapper.deleteByFPid(tFee.getfId());
+        }
         //  财务从表
         if (StringUtils.isNotNull(tfeeDo) && !"[]".equals(tfeeDo)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tfeeDo);