成本分配查询条件、发票推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationShipdetailMapper.xml

@@ -40,7 +40,7 @@ left join
 (select sbv.cDefine10,sum(sbvs.iQuantity) as iQuantity,sbvs.cInvCode,sbvs.cFree1,sbvs.cFree2,min(sbv.dDate) as dDate,max(sbv.iExchRate) as iExchRate,sbv.cSOCode as cSOCode,max(sbvs.iTaxUnitPrice) AS exportUnitPrice,sum(sbvs.iSum) as exportPrice,sum(sbvs.iNatSum) as rmbAmount,max(sbv.cexch_name) as cexch_name,sbvs.cDefine28 as cDefine28 
 from UFDATA_101_2021.dbo.SaleBillVouchs sbvs  left join UFDATA_101_2021.dbo.SaleBillVouch sbv on   sbv.SBVID=sbvs.SBVID
 group by  sbv.cDefine10,sbvs.cInvCode,sbvs.cFree1,sbvs.cFree2,sbv.cSOCode,sbvs.cDefine28
-) as sbv on sbv.cInvCode=pbv.cInvCode and sbv.cFree1=pbv.cFree1 and sbv.cFree2=pbv.cFree2 and pbv.iQuantity=sbv.iQuantity and pbv.cDefine10 = sbv.cDefine10 and pbv.cdefine28 = sbv.cDefine28 -- 自由项+合计数量做匹配
+) as sbv on sbv.cInvCode=pbv.cInvCode and sbv.cFree1=pbv.cFree1 and sbv.cFree2=pbv.cFree2 and pbv.iQuantity=sbv.iQuantity and pbv.cDefine10 = sbv.cDefine10 -- 自由项+合计数量做匹配
 LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON pbv.cVenCode= v.cVenCode
 GROUP BY sbv.cDefine10,sbv.iExchRate,sbv.cSOCode
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -273,7 +273,10 @@ SELECT
 	</select>
 
 	<select id="getInvoice"  parameterType="java.lang.String" resultType="java.util.HashMap">
-		select * from rdrecords32  where ID in
+		select iTaxUnitPrice,rdrecords32.* from rdrecords32
+		left join SO_SODetails
+		on iorderdid   =SO_SODetails.iSOsID
+		where rdrecords32.ID in
 		(select ID  from rdrecord32
 		where ccode in
 		<foreach collection="codes" item="value" index="index" open="(" separator="," close=")">

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

@@ -348,10 +348,8 @@
 	<select id="getInvoice1"  parameterType="java.lang.String" resultType="java.util.HashMap">
 
 
-		select iTaxUnitPrice,* from RdRecords01
-		left join SO_SODetails
-		on isodid =SO_SODetails.iSOsID
-		where RdRecords01.ID in
+		select * from RdRecords01
+		where ID in
 		(select ID  from RdRecord01
 		where ccode in
 		<foreach collection="codes" item="value" index="index" open="(" separator="," close=")">