推书发票打印

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -709,7 +709,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					SyDeclarationElements elementEntity = syDeclarationElementsService.getById(li.getElementsId());
 					//查询子表
 					QueryWrapper<SyDeclarationElementsItem> itemQueryWrapper = new QueryWrapper<>();
-					itemQueryWrapper.eq("sy_declaration_elements_id", li.getElementsId()).eq("del_flag", 0);
+					itemQueryWrapper.eq("sy_declaration_elements_id", li.getElementsId()).eq("del_flag", 0).orderByAsc("create_time");
 					List<SyDeclarationElementsItem> itemList1 = syDeclarationElementsItemService.list(itemQueryWrapper);
 					if (itemList1.size() == 0) {
 						map1.put("name", i + "、商品编码:");
@@ -725,7 +725,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 						listMap.add(map4);
 					} else {
 						map1.put("name", i + "、商品编码:");
-						map1.put("value", elementEntity.getInventoryCode());
+						map1.put("value", elementEntity.getHsCode());
 						listMap.add(map1);
 
 						map3.put("name", "商品描述:");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -108,16 +108,20 @@ group by b.hs_code,b.declaration_name
 
 
     <select id="queryEelement" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
-
+select t.id, t.hsCode,sum(t.boxNumber) as boxNumber, t.declarationName,t.englishProductName,sum(t.number) as number,t.unitPrice,
+sum(t.totalPrice) as totalPrice,sum(t.grossWeight) as grossWeight,sum(t.netWeight) as netWeight,pcs,
+sum(t.volume) as volume,t.curr,t.dree,t.place,t.certificate,t.styleNumber,t.smailPo,t.orderNumber,
+t.clientAbbreviation from (
 select GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,sum(a.number) as number,a.unit_price as unitPrice,
 sum(a.number*a.unit_price) as totalPrice,a.gross_weight as grossWeight,a.net_weight as netWeight,a.master_metering as pcs,a.volume as volume,
-'USD' as curr,'CHAIN' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,
+'USD' as curr,'CHAIN' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,a.box_number as boxNumber,
 a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation
  from sy_shipping_order_item a
 left join sy_declaration_elements b
 on a.elements_Id = b.id
-where a.sy_shipping_order_item_id = #{id}
-group by a.group_id
+where a.sy_shipping_order_item_id =#{id}
+group by a.group_id) t group by styleNumber
+
     </select>
 
 </mapper>