推送srm调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/PurchasePreDeliverDetailVo.java

@@ -63,6 +63,11 @@ public class PurchasePreDeliverDetailVo {
     private java.math.BigDecimal deliveryQuantity;
     //提交状态
     private String submitStatus;
+
+    // 报关品名
+    private String declarationName;
+    // 报关单位
+    private String declarationUnit;
     //明细对象
     private List<PurchasePreDeliverDetailSizeVo> purchasePreDeliverDetailSizeList;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -369,10 +369,12 @@ ${ew.customSqlSegment}
         b.distribution_Point 'distributionPoint',b.pack_id 'packId',
         b.material_composition 'composition',b.box_number 'boxNumber',
        --b.d_arrive_date 'arriveDate',sum(b.shipment_quantity) 'deliveryQuantity',
-        b.ompo_Id_Item 'purchaseId'
+        b.ompo_Id_Item 'purchaseId',
+        c.declaration_name,c.declaration_unit
         from sy_shipping_details a
         left join sy_shipping_details_item b
         on a.id=b.shipping_details_id
+        left join sy_declaration_elements c on b.elements_id=c.id
         where a.id  in
         <foreach collection="id" item="item"  open="(" separator="," close=")">
             #{item}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.documents.shippingDetails.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

@@ -444,5 +444,31 @@
 		WHERE sy_pre_assembled_packing_list_id = #{value}
 		and del_flag=0
 	</select>
+	<!-- SRM推送时信息查询-->
+	<select id="selectSrmPushExtraList" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem">
+		select * from (
+		  SELECT
+			  a.id as sy_declaration_elements_item_id,
+			  a.shipping_details_id as sy_declaration_elements_id,
+			  b.account as ac_set_no,
+			  b.garment_Factory as garment_factory,
+			  c.unit_price_including_tax as unit_price,
+			  c.coding_rules as with_code,
+			  a.sy_order_data_id,
+			  a.sy_order_data_item_id,
+			  c.ompo_id,
+			  c.ompo_id_item,
+			  a.ymoney,
+			  a.order_number,
+			  a.order_remaining_quantity as remaining_Quantity,
+			  a.sales_department,
+			  a.salesman,
+			  a.customs_declaration_unit_price
+		  FROM
+			  sy_shipping_details_item a
+				  left join sy_order_data b on a.sy_order_data_id=b.id
+				  left join sy_order_data_item c on a.sy_order_data_item_id=c.id
+		) as t1
+	</select>
 
 </mapper>