推书发票调整

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

@@ -708,19 +708,25 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 				 } else if (testName.equals("报关信息-申报要素")) {
 
-
+					 List<SyShippingOrderItem> itemList = null;
 					 List<String> elmentid = new ArrayList<>();
 
 //					 QueryWrapper<SyShippingOrderItem> queryWrapper = new QueryWrapper<>();
 //					 queryWrapper.eq("sy_shipping_order_item_id", entity.getId()).eq("del_flag", 0).groupBy("elements_Id");
 //					 List<SyShippingOrderItem> itemList = syShippingOrderItemService.list(queryWrapper);
-					 List<SyShippingOrderItem> itemList = syShippingOrderMapper.elmentsList(entity.getId());
-
-					 for(SyShippingOrderItem li : itemList){
 
-						 elmentid.add(li.getId());
+					 //成衣的
+					 if(readyFabric.equals("申报要素-成衣")){
+					    itemList = syShippingOrderMapper.elmentsList(entity.getId());
+					 }else{
+						 itemList = syShippingOrderMapper.elmentsListFabric(entity.getId());
 					 }
 
+//					 for(SyShippingOrderItem li : itemList){
+//
+//						 elmentid.add(li.getId());
+//					 }
+
 					 int i = 1;
 					 for (SyShippingOrderItem li : itemList) {
 						 map.put("name", "没用" + li.getReadyFabric());

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

@@ -69,8 +69,10 @@ public interface SyShippingOrderMapper extends BaseMapper<SyShippingOrder> {
     //查询U8 服务供应商
     public List<SyShippingOrder> queryU8ventory();
 
-    //查询合并报关要素（申报要素-发票）使用
+    //查询合并报关要素成衣（申报要素-发票）使用
     public List<SyShippingOrderItem> elmentsList(@Param("id") String id);
+    //查询合并报关要素面料（申报要素-发票）使用
+    public List<SyShippingOrderItem> elmentsListFabric(@Param("id") String id);
 
     //根据款号合并数据（国外报关单使用）
     public List<SyShippingOrderItem> mergeStyleNumber(@Param("id") String id);

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

@@ -116,7 +116,7 @@ on a.elements_Id = b.id
 left join sy_packing_list_fabric_item c
 on a.tailoring_fabric_item_id = c.id
 where a.sy_shipping_order_item_id =#{id}
- GROUP BY a.group_id
+ GROUP BY a.group_id order by a.english_name desc
     </select>
 
 
@@ -232,6 +232,14 @@ where del_flag = 0 and sy_shipping_order_item_id = #{id}  group by group_id) t
 
     </select>
 
+    <select id="elmentsListFabric"  resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
+        select a.* from sy_shipping_order_item a
+        left join sy_declaration_elements b
+        on a.elements_Id = b.id
+        where a.del_flag = 0 and a.sy_shipping_order_item_id = #{id} group by a.group_id order by a.english_name desc
+
+    </select>
+
     <select id="mergeStyleNumber" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
         select a.style_number as styleNumber,b.hs_code as hsCode,a.english_name as englishName from sy_shipping_order_item a
         left join sy_declaration_elements b