新增两个子表

mjava-kabeiyi/src/main/java/com/malk/kabeiyi/service/impl/KabeiyiServiceImpl.java

@@ -701,15 +701,15 @@ public class KabeiyiServiceImpl implements KabeiyiService {
 
 
 
-                //collect拆分成三个list  每个list长度为500
+                //collect拆分成五个list  每个list长度为500
                 List<List<Map>> collectList = new ArrayList<>();
                 for (int i = 0; i < entry.size(); i += 500) {
                     collectList.add(entry.subList(i, Math.min(i + 500, entry.size())));
                 }
 
-                if (collectList.size() > 3){
-                    log.error("发货单:{} 发货明细超过1500个, 请检查",id);
-                    errorCodes.add(id + "发货明细超过1500");
+                if (collectList.size() > 5){
+                    log.error("发货单:{} 发货明细超过2500个, 请检查",id);
+                    errorCodes.add(id + "发货明细超过2500");
                 }
 
                 //发货明细
@@ -778,9 +778,57 @@ public class KabeiyiServiceImpl implements KabeiyiService {
                     }).collect(Collectors.toList());
                 }
 
+                List<Map> list4 = new ArrayList<>();
+                if (collectList.size() > 3){
+                    list4 = collectList.get(3).stream().map(item -> {
+                        Map detail = new HashMap();
+                        detail.put("textField_m4cfhc6y", getString(item.get("socode")));//销售订单号
+                        detail.put("textField_m4cfhc6z", getString(item.get("warehouse_name")));//仓库名称
+                        detail.put("textField_m4cfhc70", getString(item.get("define29")));//客户存货码
+                        detail.put("textField_m4cfhc71", getString(item.get("inventory_name")));//存货名称
+                        detail.put("textField_m4cfhc72", getString(item.get("free2")));//产品颜色
+                        detail.put("textField_m4cfhc73", getString(item.get("cinvm_unit")));//单位
+                        detail.put("numberField_m4cfhc74", getString(item.get("quantity")));//发货数量
+                        detail.put("numberField_m4cfhc75", getString(item.get("price")));//未税单价
+                        detail.put("numberField_m4cfhc76", getString(item.get("money")));//未税总价
+                        detail.put("numberField_m4cfhc77", getString(item.get("taxprice")));//含税单价
+                        detail.put("numberField_m4cfhc78", getString(item.get("sum")));//含税总价
+                        detail.put("numberField_m4cfhc79", getString(item.get("taxrate")));//税率
+                        detail.put("numberField_m4cfhc7a", getString(item.get("tax")));//总税价
+                        detail.put("textField_m4cfhc7b", getString(item.get("free1")));//发货客户码
+
+                        return detail;
+                    }).collect(Collectors.toList());
+                }
+
+                List<Map> list5 = new ArrayList<>();
+                if (collectList.size() > 4){
+                    list5 = collectList.get(4).stream().map(item -> {
+                        Map detail = new HashMap();
+                        detail.put("textField_m4cfhc7d", getString(item.get("socode")));//销售订单号
+                        detail.put("textField_m4cfhc7e", getString(item.get("warehouse_name")));//仓库名称
+                        detail.put("textField_m4cfhc7f", getString(item.get("define29")));//客户存货码
+                        detail.put("textField_m4cfhc7g", getString(item.get("inventory_name")));//存货名称
+                        detail.put("textField_m4cfhc7h", getString(item.get("free2")));//产品颜色
+                        detail.put("textField_m4cfhc7i", getString(item.get("cinvm_unit")));//单位
+                        detail.put("numberField_m4cfhc7j", getString(item.get("quantity")));//发货数量
+                        detail.put("numberField_m4cfhc7k", getString(item.get("price")));//未税单价
+                        detail.put("numberField_m4cfhc7l", getString(item.get("money")));//未税总价
+                        detail.put("numberField_m4cfhc7m", getString(item.get("taxprice")));//含税单价
+                        detail.put("numberField_m4cfhc7n", getString(item.get("sum")));//含税总价
+                        detail.put("numberField_m4cfhc7o", getString(item.get("taxrate")));//税率
+                        detail.put("numberField_m4cfhc7p", getString(item.get("tax")));//总税价
+                        detail.put("textField_m4cfhc7q", getString(item.get("free1")));//发货客户码
+
+                        return detail;
+                    }).collect(Collectors.toList());
+                }
+
                 formData.put("tableField_m18nvp82",list1);
                 formData.put("tableField_m2j0wj90",list2);
                 formData.put("tableField_m2j0wj9f",list3);
+                formData.put("tableField_m4cfhc7c",list4);
+                formData.put("tableField_m4cfhc7r",list5);
 
                 //精准匹配
                 List<Map> jsonString = new ArrayList<>();