导出调整

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

@@ -38,6 +38,8 @@ public interface SyPreAssembledPackingListItemMapper extends BaseMapper<SyPreAss
 
 	public List<SizeTable> querySize(@Param("value") String value, @Param("groupId") String groupId);
 
+	public List<SizeTable> querySize4(@Param("value") String value, @Param("groupId") String groupId);
+
 	public List<SizeTable> querySize2(@Param("groupId") String groupId, @Param("value2") String pid);
 
 	public List<SizeTable> queryAllSize(@Param("ids") String[] ids);

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

@@ -216,6 +216,19 @@
 		ORDER BY num
 	</select>
 
+
+	<!--参照发育明细获取id的所有尺码并排序-->
+	<select id="querySize4" resultType="org.jeecg.modules.spapl.entity.SizeTable" >
+		SELECT distinct	sy_shipping_details_item.size,
+		FROM sy_shipping_details_item
+		LEFT JOIN sizetable ON sy_shipping_details_item.`size`=sizetable.`size`
+		OR sy_shipping_details_item.`size`=sizetable.`alias`
+		WHERE shipping_details_id=#{value}
+			and sy_shipping_details_item.group_id=#{groupId}
+			and sy_shipping_details_item.del_flag=0
+		ORDER BY num
+	</select>
+
 	<!--预装箱单获取id的所有尺码并排序-->
 	<select id="querySize2" resultType="org.jeecg.modules.spapl.entity.SizeTable" >
 		SELECT sy_pre_assembled_packing_list_item.size,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -278,7 +278,7 @@
 
 	<select id="sizeAlls" resultType="org.jeecg.modules.spapl.entity.SizeTable">
 		SELECT sy_packing_list_tailoring_item.size,alias,total quantity,box_Number,total/box_Number proportion,
-		id itemId,num,group_id
+		id itemId,num,group_id,sy_packing_list_tailoring_id id
 		FROM sy_packing_list_tailoring_item
 		LEFT JOIN sizetable ON sy_packing_list_tailoring_item.`size`=sizetable.`size`
 		 WHERE sy_packing_list_tailoring_id in

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

@@ -1910,8 +1910,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				sizeTables.add(sizeTable);
 				sizeItems.put(sizeTable.getGroupId(),sizeTables);
 			}
-			if(sizeMains.containsKey(sizeTable.getItemId())){
-				List<SizeTable> sizeTables=sizeMains.get(sizeTable.getItemId());
+			if(sizeMains.containsKey(sizeTable.getId())){
+				List<SizeTable> sizeTables=sizeMains.get(sizeTable.getId());
 				boolean bool=true;
 				for (SizeTable sizeTable2 : sizeTables){
 					if(sizeTable.getSize().equals(sizeTable2.getSize())){
@@ -1922,11 +1922,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				if(bool){
 					sizeTables.add(sizeTable);
 				}
-				sizeMains.put(sizeTable.getItemId(),sizeTables);
+				sizeMains.put(sizeTable.getId(),sizeTables);
 			}else{
 				List<SizeTable> sizeTables=new ArrayList<>();
 				sizeTables.add(sizeTable);
-				sizeMains.put(sizeTable.getItemId(),sizeTables);
+				sizeMains.put(sizeTable.getId(),sizeTables);
 			}
 		}