[CODE]:保存返回主表、从表

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

@@ -357,6 +357,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     public AjaxResult insertTWarehousebills(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr
             , String tWarehousebillsitems, String tWhgenleg, LoginUser loginUser, String billsType) {
         Long fPid = null;
+        Map<String, Object> map = new HashMap<>();
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
 
         if (StringUtils.isNull(warehouseBills.getfId())) {
@@ -386,6 +387,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             deleteBillsitems(fPid,tWarehousebillsitems);
         }
         // 库存明细添加
+        List<TWarehousebillsitems> tWarehousebillsitemsList=new ArrayList<>();
         if (tWarehousebillsitems != null ) {
             JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
             List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
@@ -411,6 +413,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         insertTWarehousebillsLog(wbItem, 10l,loginUser);
                     }
                 }
+                tWarehousebillsitemsList.add(wbItem);
             }
             // 录入库存明细整体状态 --> 更新主表 入账状态
             updateWarehousebillsItemsStatus(warehouseBills);
@@ -452,7 +455,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
         }
         if ("2".equals(warehouseBills.getfBillstatus())) {
-            return AjaxResult.success(warehouseBills);
+            map.put("warehouseBills", warehouseBills);
+            map.put("warehousebillsitems", tWarehousebillsitemsList);
+            return AjaxResult.success("成功", map);
         }
         return AjaxResult.success();
     }