预托书修改调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -86,7 +86,7 @@ a.create_time as createTime,b.unit_price as unitPrice,sum(b.total_price) as tota
          from sy_letter_deposit_item b
 				 left join sy_letter_deposit a
 				 on a.id = b.sy_letter_deposit_id
-         where a.del_flag = 0 and  b.del_flag = 0 group by letter_groupid) t
+         where a.del_flag = 0 and  b.del_flag = 0 group by groupid) t
 
   ${ew.customSqlSegment}
 
@@ -94,8 +94,8 @@ a.create_time as createTime,b.unit_price as unitPrice,sum(b.total_price) as tota
 
     <select id="queryItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
 
-  select itemNumber,smallPo,sum(total) as total,sum(boxNumber) as boxNumber,syPreAssembledPackingListItemId,syPreAssembledPackingListId,sum(totalGrossWeight) as totalGrossWeight,sum(totalNetWeight) as totalNetWeight,sum(totalVolume) as totalVolume,distributionPoint,containerCode,containerNumber,unitPrice,sum(totalPrice) as totalPrice,hod,salesman,salesDepartment,spurOrSubOrder,supplier,clientAbbreviation
-  from (select item_number as itemNumber,small_po as smallPo,sum(total) as total,box_number as boxNumber,GROUP_CONCAT(sy_pre_assembled_packing_list_item_id) as syPreAssembledPackingListItemId,sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
+  select itemNumber,smallPo,sum(total) as total,sum(boxNumber) as boxNumber,GROUP_CONCAT(syPreAssembledPackingListItemId) as syPreAssembledPackingListItemId,syPreAssembledPackingListId,sum(totalGrossWeight) as totalGrossWeight,sum(totalNetWeight) as totalNetWeight,sum(totalVolume) as totalVolume,distributionPoint,containerCode,containerNumber,unitPrice,sum(totalPrice) as totalPrice,hod,salesman,salesDepartment,spurOrSubOrder,supplier,clientAbbreviation
+  from (select item_number as itemNumber,small_po as smallPo,sum(total) as total,box_number as boxNumber,GROUP_CONCAT(DISTINCT sy_pre_assembled_packing_list_item_id) as syPreAssembledPackingListItemId,sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
 total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,letter_groupid as letterGroupid,
 container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,sum(total_price) as totalPrice,
 hod,salesman,sales_Department as salesDepartment,spur_or_sub_order as spurOrSubOrder,supplier,client_abbreviation as clientAbbreviation