导出调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -25,6 +25,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.hibernate.engine.jdbc.Size;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
@@ -887,6 +888,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         }
         Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();
+        long startTime = System.currentTimeMillis();
         try{
             List<SyPreAssembledPackingListVo> pageLists = syPreAssembledPackingListService.selectPage(page, queryWrapper).getRecords();
             if(pageLists.size()==0){
@@ -911,6 +913,8 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             result.setMessage(e.getMessage());
             result.setSuccess(false);
         }finally {
+            long endTime = System.currentTimeMillis();
+            System.out.println("导出时间：" + (endTime - startTime) + "ms");
             return result;
         }
 
@@ -1051,6 +1055,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                                         String endDate,
                                                         String status) {
         status="1";
+        long startTime = System.currentTimeMillis();
         SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
         QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
@@ -1111,33 +1116,69 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();
         try{
-            //   QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, request.getParameterMap());
-            //  queryWrapper.eq("del_flag","0");
-            // queryWrapper.orderByDesc(	"create_time");//创建时间倒序
-            List<SyPreAssembledPackingListVo> pageLists = syPreAssembledPackingListService.selectPage(page, queryWrapper).getRecords();
-            if(pageLists.size()==0){
+            List<SyPreAssembledPackingList> temps = syPreAssembledPackingListService.selectPage3(queryWrapper);
+            if(temps.size()==0){
                 result.setResult(null);
                 result.setMessage("导出失败！没有查询到数据");
                 result.setSuccess(false);
                 return result;
             }
-            List<SyPreAssembledPackingList> temps=new ArrayList<>();
-            for (SyPreAssembledPackingListVo temp : pageLists) {
-                QueryWrapper<SyPreAssembledPackingList> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingList>();
-                queryWrapper1.eq("id",temp.getId()).eq("del_flag",0);//预装箱单主表id
-                SyPreAssembledPackingList preAssembledPackingList=syPreAssembledPackingListService.queryById(queryWrapper1);//已筛选删除状态
-                List<SyPreAssembledPackingListItem> spaplItems = syPreAssembledPackingListItemService.selectByMainId(temp.getId());//已筛选删除状态
-                if(spaplItems.size()>0){
-                    preAssembledPackingList.setSyPreAssembledPackingListItemList(spaplItems);
+            long endTime = System.currentTimeMillis();
+            System.out.println("查询时间1：" + (endTime - startTime) + "ms");
+            //List<SyPreAssembledPackingList> temps=new ArrayList<>();
+            List<String> tempsId=new ArrayList<>();
+            for (SyPreAssembledPackingList temp : temps) {
+                tempsId.add(temp.getId());
+            }
+            QueryWrapper queryWrapper1=new QueryWrapper<>();
+            queryWrapper1.eq("del_flag","0");
+            queryWrapper1.in("sy_Pre_Assembled_Packing_List_Id",tempsId);
+            String [] tempArrays=tempsId.toArray(new String[tempsId.size()]);
+           // List<SyPreAssembledPackingList> temps=syPreAssembledPackingListService.selectPage3(queryWrapper1);//已筛选删除d状态
+            List<SyPreAssembledPackingListItem> spaplItems = syPreAssembledPackingListItemService.selectByMainIds(tempArrays);//主表id
+            List<SizeTable> sizeTables= syPreAssembledPackingListItemService.queryAllSizes(tempArrays);//主表
+            List<SizeTable> sizeTables2= syPreAssembledPackingListItemService.queryAllSizes2(tempArrays);//子表
+
+            Map<String,List<SyPreAssembledPackingListItem>> maplItems=new HashMap<>();
+            Map<String,List<SizeTable>> mapMainSizes=new HashMap<>();//主表尺码
+            Map<String,List<SizeTable>> mapItemSizes=new HashMap<>();//子表尺码
+            for (SyPreAssembledPackingListItem item : spaplItems){
+                if(maplItems.containsKey(item.getSyPreAssembledPackingListId())){//有
+                    maplItems.get(item.getSyPreAssembledPackingListId()).add(item);
+                }else{
+                    List<SyPreAssembledPackingListItem> items=new ArrayList<>();
+                    items.add(item);
+                    maplItems.put(item.getSyPreAssembledPackingListId(),items);
                 }
-                temps.add(preAssembledPackingList);
-                if(preAssembledPackingList.getStatus().equals("0")){
-                    result.setCode(201);
-                    result.setMessage("单据"+preAssembledPackingList.getDocumentNo()+"未提交!");
-                    result.setSuccess(false);
-                    return result;
+            }
+            for (SizeTable size : sizeTables){
+                if(mapItemSizes.containsKey(size.getGroupId())){//有
+                    mapItemSizes.get(size.getGroupId()).add(size);
+                }else{
+                    List<SizeTable> items=new ArrayList<>();
+                    items.add(size);
+                    mapItemSizes.put(size.getGroupId(),items);
                 }
             }
+            for (SizeTable size : sizeTables2){
+                if(mapMainSizes.containsKey(size.getId())){//有
+                    mapMainSizes.get(size.getId()).add(size);
+                }else{
+                    List<SizeTable> items=new ArrayList<>();
+                    items.add(size);
+                    mapMainSizes.put(size.getId(),items);
+                }
+            }
+            for (SyPreAssembledPackingList temp : temps){
+               // temp.setSizeTables(syPreAssembledPackingListItemService.queryAllSizes(temp.getId()));
+                temp.setSyPreAssembledPackingListItemList(maplItems.get(temp.getId()));
+                for (SyPreAssembledPackingListItem item : temp.getSyPreAssembledPackingListItemList()){
+                    item.setSizeTables(mapItemSizes.get(item.getGroupId()));
+                }
+                temp.setSizeTables(mapMainSizes.get(temp.getId()));
+            }
+            long endTime2 = System.currentTimeMillis();
+            System.out.println("查询时间2：" + (endTime2 - startTime) + "ms");
             String load="D:\\单证模板\\test2.xlsx";
             if(status!=null&&status.equals("1")){
                 load="D:\\单证模板\\预装箱单成衣.xlsx";
@@ -1172,6 +1213,8 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             result.setMessage(e.getMessage());
             result.setSuccess(false);
         }finally {
+            long endTime = System.currentTimeMillis();
+            System.out.println("导出时间：" + (endTime - startTime) + "ms");
             return result;
         }
 
@@ -1255,7 +1298,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         Cell cell = row2.createCell(i);//横向
                         if(i>2&&i!=5&&args3[i].length()>0){
                             if(args3[i]==null||args3[i].equals("null")){
-                                cell.setCellValue(0);
+                                //cell.setCellValue(null);
                             }else{
                                 cell.setCellValue(Double.parseDouble(args3[i]));
                             }
@@ -1478,7 +1521,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     Row row2 = sheet.createRow(3);
                     for (int x=0;x<params.length;x++){
                         Cell cell = row2.createCell(x);//横向
-                        if(x>6&&x<params.length-8){
+                        if(x>6&&x<params.length-7){
                             cell.setCellStyle(cellStyle);
                         }else{
                             cell.setCellStyle(cellStyle2);
@@ -1490,7 +1533,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     }
                 }
                 List<SizeTable> sizes=list.get(i).getSizeTables();
-                SyPreAssembledPackingListItem itemN=list.get(0);
+                //SyPreAssembledPackingListItem itemN=list.get(0);
                 if(name!=null&&name.equals("1")){
                     params=list.get(i).toString3().replace("null","").split(",");
                     for (int y=0;y<params.length;y++){
@@ -1499,14 +1542,14 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                             cell.setCellStyle(cellStyle2);
                             cell.setCellValue(i+1);//
                             continue;
-                        } else if(y>6&&y<params.length-8){
+                        } else if(y>6&&y<params.length-7){
                             cell.setCellStyle(cellStyle);
                         } else{
                             cell.setCellStyle(cellStyle2);
                             cell.setCellValue(params[y]);//
                         }
 
-                        if(y==4||y==5||y>6&&y<params.length-8){
+                        if(y==4||y==5||y>6&&y<params.length-7){
                             if(!params[y].equals("null")&&!params[y].equals("")){
                                 cell.setCellValue(Integer.parseInt(params[y]));//
                             }
@@ -1631,7 +1674,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 System.out.println("文件大小--fileSize\t"+file.getSize()/1024+"KB");
                 InputStream inputStream=file.getInputStream();
                 ImportParams params = new ImportParams();
-                System.out.println("inputSream:\t"+inputStream);
+                //System.out.println("inputSream:\t"+inputStream);
                 Workbook workbook=new XSSFWorkbook(inputStream);
 
                 long startTime = System.currentTimeMillis();
@@ -1819,7 +1862,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 if(x==0){
                     num1= sheet.getRow(0).getLastCellNum();
                 }
-                System.out.println("num1.size\t"+num1);
+                //System.out.println("num1.size\t"+num1);
                 for (int i=0;i<num1;i++){
                     Cell cell=row.getCell(i);
                     if(x==0){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SizeTable.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.spapl.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -37,4 +38,12 @@ public class SizeTable {
     @Excel(name = "分组id", width = 15)
     @ApiModelProperty(value = "分组id")
     private String groupId;
+
+    @Excel(name = "id", width = 15)
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "分组名称")
+    @TableField(exist = false)
+    private java.lang.String groupName;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -302,6 +302,10 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "报关单价")
 	private BigDecimal customsDeclarationUnitPrice;
 
+	@ApiModelProperty(value = "分组名称")
+	@TableField(exist = false)
+	private java.lang.String groupName;
+
 	//序号,H/D,PO,款号,订单号,UNIT PRICE（单价,分销点,ITEMCODE,启始箱号,结束箱号,颜色(中英文) sizes	件数/每箱,箱数,总件数,外箱长度,外箱宽度,外箱高度,总体积,外箱净重,总净重,外箱毛重,总毛重,NN.W,总价
 
 	public SyPreAssembledPackingListItem(){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/SyPreAssembledPackingListItemMapper.java

@@ -50,4 +50,8 @@ public interface SyPreAssembledPackingListItemMapper extends BaseMapper<SyPreAss
 	@InterceptorIgnore(tenantLine = "true")
 	public Integer insertBatch(@Param("list") List<SyPreAssembledPackingListItem> item);
 
+	public List<SizeTable> queryAllSizes(@Param("list")String []ids);
+
+	public List<SizeTable> queryAllSizes2(@Param("list")String []ids);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/SyPreAssembledPackingListMapper.java

@@ -30,6 +30,8 @@ public interface SyPreAssembledPackingListMapper extends BaseMapper<SyPreAssembl
 
    List<SyPreAssembledPackingListVo> selectPage2(  @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 
+   List<SyPreAssembledPackingList> selectPage3(  @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
+
    PackingHeaderVo pushData(String id);
 
    List<PackingHeaderVo> pushDataBatch(@Param("list") String[] ids);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -141,6 +141,7 @@
 		ORDER BY sy_order_data_item_id
 	</select>
 
+
 	<!--获取所有id的所有尺码去重并排序2-->
 	<select id="querySizes2" resultType="org.jeecg.modules.spapl.entity.SizeTable" parameterType="java.lang.String">
 		SELECT DISTINCT sy_pre_assembled_packing_list_item.size,alias
@@ -152,6 +153,40 @@
 		ORDER BY sy_order_data_item_id
 	</select>
 
+	<select id="queryAllSizes" resultType="org.jeecg.modules.spapl.entity.SizeTable" parameterType="java.lang.String">
+		SELECT
+		sy_pre_assembled_packing_list_item.size,
+		sy_pre_assembled_packing_list_id as id,
+		id as itemId,
+		total quantity,
+		total/box_number proportion,
+		group_id
+		FROM sy_pre_assembled_packing_list_item
+		LEFT JOIN sizetable ON sy_pre_assembled_packing_list_item.`size`=sizetable.`size`
+		OR sy_pre_assembled_packing_list_item.`size`=sizetable.`alias`
+		WHERE sy_pre_assembled_packing_list_id in
+		<foreach collection="list" item="value" index="index" open="(" separator="," close=")">
+			#{value}
+		</foreach>
+		 and sy_pre_assembled_packing_list_item.del_flag=0
+		ORDER BY sy_order_data_item_id
+	</select>
+
+	<select id="queryAllSizes2" resultType="org.jeecg.modules.spapl.entity.SizeTable" parameterType="java.lang.String">
+		SELECT DISTINCT
+		sy_pre_assembled_packing_list_item.size,
+		sy_pre_assembled_packing_list_id as id
+		FROM sy_pre_assembled_packing_list_item
+		LEFT JOIN sizetable ON sy_pre_assembled_packing_list_item.`size`=sizetable.`size`
+		OR sy_pre_assembled_packing_list_item.`size`=sizetable.`alias`
+		WHERE sy_pre_assembled_packing_list_id in
+		<foreach collection="list" item="value" index="index" open="(" separator="," close=")">
+			#{value}
+		</foreach>
+		and sy_pre_assembled_packing_list_item.del_flag=0
+		ORDER BY sy_order_data_item_id
+	</select>
+
 	<!--参照发育明细获取id的所有尺码并排序-->
 	<select id="querySize" resultType="org.jeecg.modules.spapl.entity.SizeTable" >
 		SELECT 	sy_shipping_details_item.size,
@@ -172,8 +207,8 @@
 	<select id="querySize2" resultType="org.jeecg.modules.spapl.entity.SizeTable" >
 		SELECT sy_pre_assembled_packing_list_item.size,
 		alias,
-		total quantity,
 		box_Number,
+		total quantity,
 		total/box_number proportion,
 		sy_pre_assembled_packing_list_item.id itemId,
 		group_id
@@ -206,13 +241,17 @@
 	</select>
 
 	<select id="querySize3" resultType="org.jeecg.modules.spapl.entity.SizeTable" >
-		SELECT size, sy_order_data_item_id itemId
-		FROM sy_pre_assembled_packing_list_item
-		WHERE sy_pre_assembled_packing_list_id in
+		SELECT DISTINCT b.size, b.sy_order_data_item_id itemId,
+		CONCAT(b.small_po,b.hod,b.unit_price,d.material_composition) groupName
+		FROM sy_pre_assembled_packing_list_item b
+		left join sy_shipping_details_item d
+		on	b.sy_declaration_elements_item_id=d.id
+		WHERE b.sy_pre_assembled_packing_list_id in
 		<foreach collection="list" item="value" index="index" open="(" separator="," close=")">
 			#{value}
 		</foreach>
-		and del_flag=0
+		and b.del_flag=0  /*b.small_po,b.hod,b.unit_price,d.material_composition*/
+		group by b.size,b.small_po,b.hod,b.unit_price,d.material_composition
 		order by itemId
 	</select>
 
@@ -262,63 +301,66 @@
 
 	<select id="selectByMainIds"   resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem">
 		SELECT
-			id,
-			sy_pre_assembled_packing_list_id,
-			sy_declaration_elements_id,
-			sy_order_data_id,
-			item_Code,
-			ac_set_no,
-			garment_factory,
-			hod,
-			plan_Size,
-			style_no,
-			po_no,
-			item_code,
-			distribution_point,
-			prepack_sku,
-			size,
-			starting_box_number,
-			end_case_number,
-			colour,
-			pieces_box,
-			box_number boxnumber,/*箱数*/
-			sum(total) total,/*件数*/
-			plan_Quantity,/*计划装箱数量*/
-			actual_Packing_Qty,/*实际装箱数量*/
-			net_weight,
-			total_net_weight total_net_weight,/*总净重*/
-			gross_weight,
-			total_gross_weight total_gross_weight,/*总毛重*/
-			outer_box_length,/*长*/
-			outer_Box_Width,/*宽*/
-			outer_Box_Height,/*高*/
-			total_volume total_volume,/*总体积*/
-			net_weight_too net_weight_too,/*净净重*/
-			unit_price,
-			sum(total_price) total_price,/*总价*/
-			with_code,
-			small_po,
-        	supplier_Code,/*最底层供应商编码*/
-			supplier,/*最底层供应商名称*/
-			ompo_account,/*采购委外账套号*/
-			ompo_Id,/*委外采购主表Id*/
-			ompo_Id_Item,/*委外采购子表Id*/
-			ymoney,/*佣金*/
-			inventory_name,
-			inventory_code,
-			spur_or_sub_order,
-			factory_unit_price,
-			master_Metering,
-			group_id
+			b.id,
+			b.sy_pre_assembled_packing_list_id,
+			b.sy_declaration_elements_id,
+			b.sy_order_data_id,
+			b.item_Code,
+			b.ac_set_no,
+			b.garment_factory,
+			b.hod,
+			b.plan_Size,
+			b.style_no,
+			b.po_no,
+			b.item_code,
+			b.distribution_point,
+			b.prepack_sku,
+			b.size,
+			b.starting_box_number,
+			b.end_case_number,
+			b.colour,
+			b.pieces_box,
+			b.box_number boxnumber,/*箱数*/
+			sum(b.total) total,/*件数*/
+			b.plan_Quantity,/*计划装箱数量*/
+			b.actual_Packing_Qty,/*实际装箱数量*/
+			b.net_weight,
+			b.total_net_weight total_net_weight,/*总净重*/
+			b.gross_weight,
+			b.total_gross_weight total_gross_weight,/*总毛重*/
+			b.outer_box_length,/*长*/
+			b.outer_Box_Width,/*宽*/
+			b.outer_Box_Height,/*高*/
+			b.total_volume total_volume,/*总体积*/
+			b.net_weight_too net_weight_too,/*净净重*/
+			b.unit_price,
+			sum(b.total_price) total_price,/*总价*/
+			b.with_code,
+			b.small_po,
+			b.supplier_Code,/*最底层供应商编码*/
+			b.supplier,/*最底层供应商名称*/
+			b.ompo_account,/*采购委外账套号*/
+			b.ompo_Id,/*委外采购主表Id*/
+			b.ompo_Id_Item,/*委外采购子表Id*/
+			b.ymoney,/*佣金*/
+			b.inventory_name,
+			b.inventory_code,
+			b.spur_or_sub_order,
+			b.factory_unit_price,
+			b.master_Metering,
+			b.group_id,
+			CONCAT(b.small_po,b.hod,b.unit_price,d.material_composition) groupName
 			/*SUM(total_quantity) total_quantity,合计数量/件数*/
-		FROM  sy_pre_assembled_packing_list_item
-		WHERE sy_pre_assembled_packing_list_id in
+		FROM  sy_pre_assembled_packing_list_item b
+		left join sy_shipping_details_item d
+		on	b.sy_declaration_elements_item_id=d.id
+		WHERE b.sy_pre_assembled_packing_list_id in
 		<foreach collection="list" item="value" index="index" open="(" separator="," close=")">
 			#{value}
 		</foreach>
-		 AND del_flag = 0
-		GROUP BY group_id/*原本按照颜色进行分组 现改为按照分组id*/
-		order by starting_Box_Number+0 asc ,colour asc
+		 AND b.del_flag = 0
+		GROUP BY b.group_id/*原本按照颜色进行分组 现改为按照分组id*/
+		order by b.colour asc, b.starting_Box_Number+0 asc
 	</select>
 
 	<select id="insertBatch"   resultType="int">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -50,8 +50,8 @@
         a.document_No,/*单据号*/
         a.order_number,/*订单号*/
         a.item_number, /*款号*/
-	    (SELECT english_product_name FROM  sy_declaration_elements WHERE id=a.elements_id) englishProductName ,/*中文品名*/
-	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
+	    c.english_product_name englishProductName ,/*中文品名*/
+	    c.declaration_name  productName,/*英文品名*/
         a.size_range,/*尺码范围*/
         a.customer,/*客户名称*/
         a.container_code,/*集装箱号*/
@@ -84,6 +84,57 @@
     FROM Sy_Pre_Assembled_Packing_List  a
     LEFT JOIN Sy_Pre_Assembled_Packing_List_item  b
     ON a.id=b.sy_pre_assembled_packing_list_id  AND b.del_flag='0'
+    left join sy_declaration_elements c
+    on a.elements_Id=c.id
+    ${ew.customSqlSegment}
+    GROUP BY a.id
+    ORDER BY a.`create_time` DESC
+	</select>
+
+    <select id="selectPage3" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
+    /*获取汇总数据*/
+    SELECT
+        a.id,/*主键id*/
+        a.document_No,/*单据号*/
+        a.order_number,/*订单号*/
+        a.item_number, /*款号*/
+	    c.english_product_name englishProductName ,/*中文品名*/
+	    c.declaration_name  productName,/*英文品名*/
+	    a.elements_id,
+        a.size_range,/*尺码范围*/
+        a.customer,/*客户名称*/
+        a.container_code,/*集装箱号*/
+        a.container_number,/*集装箱代号*/
+        a.u8_remarks,/*备注*/
+        b.garment_factory,/*成衣工厂*/
+        a.depositary_receipt_no,/*预托书号*/
+        a.memo,/*备注*/
+        a.order_type,/*订单类型*/
+        a.customer_abbreviation,/*客户简称*/
+        a.`update_time`,/*修改日期*/
+        a.`status`,/*单据状态*/
+        a.total_Boxes totalboxes,/*总箱数*/
+        a.`push_Status`,/*推送状态*/
+        a.is_Reference,/*是否被参照*/
+        b.master_Metering,/*计量单位*/
+        SUM(b.total) total,/*件数*/
+        b.hod as  preDeliveryDate,/*预发货日期*/
+        a.total_net_weight totalnetweight,/*总净重*/
+        a.total_gross_weight totalgrossweight,/*总毛重*/
+        a.total_volume totalvolume,/*总体积*/
+        a.total_price totalprice,/*总价*/
+        /*sum(b.total) totalquantity,*/
+        b.factory_Unit_Price factoryUnitPrice,/*工厂单价*/
+        a.spur_or_sub_order,/*采购委外订单号*/
+        b.inventory_name,/*存货名称*/
+        b.small_po,/*小po*/
+        b.colour,/*颜色*/
+        b.distribution_point/*分销点*/
+    FROM Sy_Pre_Assembled_Packing_List  a
+    LEFT JOIN Sy_Pre_Assembled_Packing_List_item  b
+    ON a.id=b.sy_pre_assembled_packing_list_id  AND b.del_flag='0'
+    left join sy_declaration_elements c
+    on a.elements_Id=c.id
     ${ew.customSqlSegment}
     GROUP BY a.id
     ORDER BY a.`create_time` DESC
@@ -101,7 +152,7 @@
         LEFT JOIN Sy_Pre_Assembled_Packing_List_item b
         ON a.id = b.sy_pre_assembled_packing_list_id
         left join sy_shipping_details_item c
-        on a.elements_id=c.elements_id
+        on b.sy_declaration_elements_item_id=c.id
         AND b.del_flag = '0'
         ${ew.customSqlSegment}
         GROUP BY a.id

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/ISyPreAssembledPackingListItemService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.spapl.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.spapl.entity.SizeTable;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
@@ -35,4 +36,10 @@ public interface ISyPreAssembledPackingListItemService extends IService<SyPreAss
 
 	public List<SizeTable> sort(List<SizeTable> sizes);
 
+
+	public List<SyPreAssembledPackingListItem> selectByMainIds(String[] ids);
+
+	public List<SizeTable> queryAllSizes(String [] value);
+
+	public List<SizeTable> queryAllSizes2(String [] value);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/ISyPreAssembledPackingListService.java

@@ -120,4 +120,6 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 	public String[] getExcelId();
 
 	List<SyPreAssembledPackingList>  queryById2( Map<String, List<String>> ids, List<String> allIds);
+
+	List<SyPreAssembledPackingList> selectPage3(QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListItemServiceImpl.java

@@ -119,6 +119,21 @@ public class SyPreAssembledPackingListItemServiceImpl extends ServiceImpl<SyPreA
 		return sizes;
 	}
 
+	@Override
+	public List<SyPreAssembledPackingListItem> selectByMainIds(String[] ids) {
+		return syPreAssembledPackingListItemMapper.selectByMainIds(ids);
+	}
+
+	@Override
+	public List<SizeTable> queryAllSizes(String[] value) {
+		return syPreAssembledPackingListItemMapper.queryAllSizes(value);
+	}
+
+	@Override
+	public List<SizeTable> queryAllSizes2(String[] value) {
+		return syPreAssembledPackingListItemMapper.queryAllSizes2(value);
+	}
+
 	public boolean saveBatch(List<SyPreAssembledPackingListItem> entityList ) {
 		syPreAssembledPackingListItemMapper.insertBatch(entityList);
 		return  true;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -61,6 +61,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 
 	BigDecimal add(List<SyPreAssembledPackingListItem> items,String pid){
 		BigDecimal box=new BigDecimal(0);//获取总箱数
+		Map<String,BigDecimal> maps=new HashMap();
 		for (SyPreAssembledPackingListItem item : items){
 			List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
 			item.setSyPreAssembledPackingListId(pid);//获取主表id
@@ -114,9 +115,20 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				//syItem.setExcessQuantity(syItem.getSurplusQuantity().subtract(item1.getTotal()).negate());
 				//syItem.setIsReference(1);//标识已被参照
 				//syShippingDetailsItemMapper.updateById(syItem);//修改发运明细
-				updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
+				if(item1.getTotal().doubleValue()>0){
+					if(maps.containsKey(item.getSyDeclarationElementsItemId())){
+						maps.put(item1.getSyDeclarationElementsItemId(),maps.get(item1.getSyDeclarationElementsItemId()).add(item1.getTotal()));
+					}else{
+						maps.put(item1.getSyDeclarationElementsItemId(),item1.getTotal());
+					}
+					//updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
+				}
 			}
 		}
+		for (String key : maps.keySet()){
+			//updateQuantity(maps.get(key),key);
+		}
+
 		return box;
 	}
 
@@ -176,7 +188,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					item1.setSyPreAssembledPackingListId(pid);
 					item1.setId(oConvertUtils.id());//获取到随机id
 					syPreAssembledPackingListItemMapper.insert(item1);
-					updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
+					//updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
 				}else{
 					QueryWrapper queryWrapper=new QueryWrapper();
 					queryWrapper.eq("id", item1.getId());//子表id
@@ -184,7 +196,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					BigDecimal total=syPreAssembledPackingListItemMapper.selectOne(queryWrapper).getTotal();
 					total=total.subtract(item.getTotal());
 					syPreAssembledPackingListItemMapper.updateById(item1);//如果没修改成功就是新增数据
-					updateQuantity(total.negate(),item1.getSyDeclarationElementsItemId());
+					//updateQuantity(total.negate(),item1.getSyDeclarationElementsItemId());
 				}
 				//这个构造器用来获取预装箱单里所有参照了改发运明细数量的合计
 				/*QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
@@ -294,12 +306,29 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Override
 	@Transactional
 	public Integer delMain(String id) {
+		long startTime = System.currentTimeMillis();
 		List<SyPreAssembledPackingListItem> items2=syPreAssembledPackingListItemMapper.selectAll(id);
+		Map<String,BigDecimal> maps=new HashMap();
 		for (SyPreAssembledPackingListItem item : items2){
 			if(item.getTotal()!=null){
-				updateQuantity(item.getTotal().negate(),item.getSyDeclarationElementsItemId());
+				if(item.getTotal().doubleValue()>0){
+					if(maps.containsKey(item.getSyDeclarationElementsItemId())){
+						maps.put(item.getSyDeclarationElementsItemId(),maps.get(item.getSyDeclarationElementsItemId()).add(item.getTotal()));
+					}else{
+						maps.put(item.getSyDeclarationElementsItemId(),item.getTotal());
+					}
+					//updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
+				}
 			}
 		}
+		for (String key : maps.keySet()){
+			//updateQuantity(maps.get(key).negate(),key);
+		}
+		/*for (SyPreAssembledPackingListItem item : items2){
+			if(item.getTotal()!=null){
+				updateQuantity(item.getTotal().negate(),item.getSyDeclarationElementsItemId());
+			}
+		}*/
 		QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
 		queryWrapperCount.select("id");
 		queryWrapperCount.ne("del_Flag","0");
@@ -307,22 +336,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		List<Object> objs=syPreAssembledPackingListItemMapper.selectObjs(queryWrapperCount);
 		syPreAssembledPackingListItemMapper.deleteByMainId(id);//将删除状态更改为1
 		int row=syPreAssembledPackingListMapper.deleteId(id);//将删除状态更改为1
-		//根据主表id获取所有的子表信息
-		//问题：这样会查询到上次就已经删除的数据,数据会乱
-		//思路：让上次被删除的数据避免被重用
-
-		/*for(SyPreAssembledPackingListItem item : items2){//要根据这个去改变对应发运明细的剩余数量
-			if(objs.indexOf(item.getId())!=-1){//如果这条数据已经被删除的数据就执行下条数据
-				continue;
-			}
-			//获取发育明细数据
-			SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item.getSyDeclarationElementsItemId());
-			//预装箱单装箱数量-x=剩余数量+x
-			syItem.setSurplusQuantity(syItem.getSurplusQuantity().add(item.getTotal()));
-			//超发数量=剩余数量-本次删除次数
-			syItem.setExcessQuantity(syItem.getSurplusQuantity().subtract(item.getTotal()));
-			syShippingDetailsItemMapper.updateById(syItem);//修改数据
-		}*/
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("sy_pre_assembled_packing_list_id",id);
 		List<SyLetterDepositItem> syLetterDepositItem=syLetterDepositItemMapper.selectList(queryWrapper);
@@ -343,6 +356,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				syLetterDepositMapper.update(null,wrapper1);
 			}
 		}
+		long endTime2 = System.currentTimeMillis();
+		System.out.println("删除时间：" + (endTime2 - startTime) + "ms");
 		return row;
 	}
 
@@ -545,6 +560,28 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		boolean bool=false;
 		List<SyPreAssembledPackingList> lists=new ArrayList<>();
 		List<SyPreAssembledPackingListItem> listItems=new ArrayList<>();
+
+		List<SyPreAssembledPackingList> lists2=new ArrayList<>();
+		//Map<String,>
+		List<String> ids=new ArrayList<>();
+		long startTime = System.currentTimeMillis();
+		for (SyPreAssembledPackingList item : items1){
+			List<SyPreAssembledPackingListItem> listItems2=item.getSyPreAssembledPackingListItemList();
+			for (SyPreAssembledPackingListItem listItem : listItems2){
+				for (SizeTable sizeTable : listItem.getSizeTables()){
+					ids.add(sizeTable.getItemId());
+				}
+			}
+		}
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.in("id",ids);
+		List<SyShippingDetailsItem> syItems=syShippingDetailsItemMapper.selectList(queryWrapper);//获取数据
+		Map<String,SyShippingDetailsItem> mapItems=new HashMap<>();
+		for (SyShippingDetailsItem item : syItems){
+			mapItems.put(item.getId(),item);
+		}
+		long endTime2 = System.currentTimeMillis();
+		System.out.println("批量查询时间：" + (endTime2 - startTime) + "ms");
 		try{
 			for(SyPreAssembledPackingList syPreAssembledPackingList : items1){
 				SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS");
@@ -562,7 +599,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				syPreAssembledPackingList.setId(oConvertUtils.id());
 				//syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
 				List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
-				Map<String,BigDecimal> maps=new HashMap<>();
+				//Map<String,BigDecimal> maps=new HashMap<>();
 				//System.out.println("items的长度\t"+items.size());
 				for (SyPreAssembledPackingListItem item : items){
 				//	System.out.println("净重\t"+item.getTotalNetWeight());
@@ -592,7 +629,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						item1.setId(oConvertUtils.id());//获取到随机id
 						//item1.setRemainingQuantity(boxNumber);//剩余数量
 						//获取发育明细数据
-						SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
+						//SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
+						SyShippingDetailsItem syItem=mapItems.get(size.getItemId());
 						if(syItem!=null){
 							item1.setPackId(syItem.getPackId());
 							item1.setUnitPrice(syItem.getSalesUnitPrice());//获取销售单价
@@ -626,14 +664,14 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 							syItem.setExcessQuantity(item1.getTotal().subtract(syItem.getSurplusQuantity()));
 							//syItem.setIsReference(1);//标识已被参照
 							syShippingDetailsItemMapper.updateById(syItem);//修改发运明细*/
-							if(item1.getTotal().doubleValue()>0){
+							/*if(item1.getTotal().doubleValue()>0){
 								if(maps.containsKey(item.getSyDeclarationElementsItemId())){
 									maps.put(item1.getSyDeclarationElementsItemId(),maps.get(item1.getSyDeclarationElementsItemId()).add(item1.getTotal()));
 								}else{
 									maps.put(item1.getSyDeclarationElementsItemId(),item1.getTotal());
 								}
 								//updateQuantity(item1.getTotal(),item1.getSyDeclarationElementsItemId());
-							}
+							}*/
 						}
 						syPreAssembledPackingList.setTotalPrice(syPreAssembledPackingList.getTotalPrice().add(item1.getTotalPrice()));//获取总价
 						if(size.getProportion()==0){
@@ -641,13 +679,14 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						}
 						SyPreAssembledPackingListItem item2=new SyPreAssembledPackingListItem();
 						BeanUtils.copyProperties(item1,item2);
+						item2.setPackId("测试文件");
 						listItems.add(item2);
 						//syPreAssembledPackingListItemMapper.insert(item1);//添加子表数据
 					}
 				}
-				for (String key : maps.keySet()){
+			/*	for (String key : maps.keySet()){
 					//updateQuantity(maps.get(key),key);
-				}
+				}*/
 				SyShippingDetails syShippingDetails=syShippingDetailsMapper.selectById(syPreAssembledPackingList.getSyDeclarationElementsId());
 				if(syShippingDetails!=null){
 					syPreAssembledPackingList.setCustomer(syShippingDetails.getCustomer());
@@ -663,7 +702,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			bool=false;
 		}
 
-		long startTime = System.currentTimeMillis();
 		syPreAssembledPackingListItemMapper.insertBatch(listItems);
 		long endTime = System.currentTimeMillis();
 		System.out.println("批量插入时间：" + (endTime - startTime) + "ms");
@@ -685,7 +723,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			String name="";
 			String ids="";
 			for (SyPreAssembledPackingListItem item :main.getSyPreAssembledPackingListItemList()){
-				System.out.println("size\t"+item.getSizeTables());
+				//System.out.println("size\t"+item.getSizeTables());
 				total3=total3.add(item.getTotal());
 				int num2=0;
 				for (SizeTable size : item.getSizeTables()){
@@ -722,9 +760,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					//throw new JeecgBootException("该单据已被参照,请勿重复提交");
 				}
 			}
-			System.out.println("本次数量\t"+total3);
-			System.out.println("现有数量\t"+total2);
-			System.out.println("原单据数量\t"+total1);
 			total4=total4.add(total2).add(total3);
 			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
 				throw new JeecgBootException("本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
@@ -802,9 +837,60 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Override
 	public List<SyPreAssembledPackingList>  queryById2(Map<String, List<String>> ids, List<String> allIds){
 		long startTime = System.currentTimeMillis();
-		System.out.println("idsmaps\t"+ids);
-		List<SyPreAssembledPackingList> lists=syPreAssembledPackingListMapper.queryById2(allIds.toArray(new String[allIds.size()]));
-		for (SyPreAssembledPackingList entity :lists){
+		String [] arraySizes= allIds.toArray(new String[allIds.size()]);
+		List<SyPreAssembledPackingList> lists=syPreAssembledPackingListMapper.queryById2(arraySizes);
+
+		List<SyPreAssembledPackingListItem> itemLists= syPreAssembledPackingListItemMapper.selectByMainIds(arraySizes);
+		List<SizeTable> sizeLists=syPreAssembledPackingListItemMapper.querySize3(arraySizes);//主表尺码
+		List<SizeTable> sizeLists2=syPreAssembledPackingListItemMapper.queryAllSize(arraySizes);//子表尺码
+
+		Map<String,List<SyPreAssembledPackingListItem>> maplItems=new HashMap<>();
+		Map<String,List<SizeTable>> mapMainSizes=new HashMap<>();//主表尺码
+		Map<String,List<SizeTable>> mapItemSizes=new HashMap<>();//子表尺码
+
+		for (SizeTable size : sizeLists2){//子表尺码
+			if(mapItemSizes.containsKey(size.getGroupId())){//有
+				mapItemSizes.get(size.getGroupId()).add(size);
+			}else{
+				List<SizeTable> items=new ArrayList<>();
+				items.add(size);
+				mapItemSizes.put(size.getGroupId(),items);
+			}
+		}
+
+		for (SizeTable size : sizeLists){//主表尺码
+			if(mapMainSizes.containsKey(size.getGroupName())){//有
+				mapMainSizes.get(size.getGroupName()).add(size);
+			}else{
+				List<SizeTable> items=new ArrayList<>();
+				items.add(size);
+				mapMainSizes.put(size.getGroupName(),items);
+			}
+		}
+		System.out.println("mapMainSizes\n"+mapMainSizes);
+
+		for (SyPreAssembledPackingListItem item : itemLists){//子表获取尺码
+			if(mapItemSizes.containsKey(item.getGroupId())){
+				item.setSizeTables(mapItemSizes.get(item.getGroupId()));
+			}
+			if(maplItems.containsKey(item.getGroupName())){//有
+				maplItems.get(item.getGroupName()).add(item);
+			}else{
+				List<SyPreAssembledPackingListItem> items=new ArrayList<>();
+				items.add(item);
+				maplItems.put(item.getGroupName(),items);
+			}
+		}
+
+		for (SyPreAssembledPackingList entity : lists){//主表获取子表数据
+			if(mapMainSizes.containsKey(entity.getGroupName())){
+				entity.setSizeTables(mapMainSizes.get(entity.getGroupName()));
+			}
+			if(maplItems.containsKey(entity.getGroupName())){
+				entity.setSyPreAssembledPackingListItemList(maplItems.get(entity.getGroupName()));
+			}
+		}
+		/*for (SyPreAssembledPackingList entity :lists){
 			System.out.println("entity.getname\t"+entity.getGroupName());
 			List<String> idList=ids.get(entity.getGroupName());
 			String[] arrasId=idList.toArray(new String[idList.size()]);
@@ -836,7 +922,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			}
 			entity.setSyPreAssembledPackingListItemList(itemList);
 			//lists.add(entity);
-		}
+		}*/
 		long endTime3 = System.currentTimeMillis();
 		System.out.println("查数据时间运行：" + (endTime3 - startTime) + "ms");
 		return lists;
@@ -876,6 +962,11 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		return lists;*/
 	}
 
+	@Override
+	public List<SyPreAssembledPackingList> selectPage3(QueryWrapper<SyPreAssembledPackingListVo> queryWrapper) {
+		return syPreAssembledPackingListMapper.selectPage3(queryWrapper);
+	}
+
 	public List<SizeTable> sort(List<SizeTable> sizes) {
 		int i=0;
 		for(SizeTable size : sizes){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -214,7 +214,7 @@ public class SyPreAssembledPackingListVo {
 		orderNumber+","+
 		itemNumber+","+
 		customerAbbreviation+","+
-		new SimpleDateFormat("yyyy-MM-dd").format(preDeliveryDate)+","+
+		preDeliveryDate.substring(0,10)+","+
 		smallPo+","+
 		distributionPoint+","+
 		inventoryName+","+
@@ -225,7 +225,7 @@ public class SyPreAssembledPackingListVo {
 		totalNetWeight+","+
 		totalGrossWeight+","+
 		totalVolume+","+
-		containerCode+","+
+		//containerCode+","+
 		containerNumber+","+
 		depositaryReceiptNo+","+
 		garmentFactory;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -171,8 +171,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					item1.setSort(size.getNum());//获取序号
 					item1.setId(oConvertUtils.id());//获取到随机id
 					SyPreAssembledPackingListItem syPreItem=syPreAssembledPackingListItemMapper.selectById(item1.getSyPreAssembledPackingListItemId());//获取预装箱单数据
-					syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber));//新剩余数量=原剩余数量-装箱单新增数量
-					syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber).negate());
+//					syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber));//新剩余数量=原剩余数量-装箱单新增数量
+//					syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber).negate());
 					item1.setSalesman(syPreItem.getSalesman());//获取业务员
 					if(item1.getFactoryUnitPrice()!=null){
 						item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价