Browse Source

成本分配 发运明细

liuchaohui 2 years ago
parent
commit
c350473880

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/SyCostAllocationShipdetailMapper.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.cost.mapper;
 
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cost.entity.SyCostAllocationShipdetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +17,6 @@ public interface SyCostAllocationShipdetailMapper extends BaseMapper<SyCostAlloc
 	public boolean deleteByMainId(String mainId);
     
 	public List<SyCostAllocationShipdetail> selectByMainId(String mainId);
+
+	List<SyCostAllocationShipdetail> queryByCostShipdetail(@Param("code") String code);
 }

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

@@ -15,4 +15,137 @@
 		WHERE
 			 sy_cost_allocation_id = #{id} 		
 	</select>
+
+	<select id="queryByCostShipdetail" resultType="org.jeecg.modules.cost.entity.SyCostAllocationShipdetail">
+		SELECT
+			sh.cDefine10 AS invoiceNum,
+			CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ,
+			sum(shs.iQuantity) as shipQuantity,
+			sh.iExchRate AS exchangeRate,
+			sh.cSOCode AS orderNum,
+			c.cInvName AS poStyleNum,
+			sum(shs.iTaxUnitPrice) AS exportUnitPrice ,
+			sum(shs.iSum) as exportPrice,
+			sum(iNatSum) as rmbAmount,
+			max(so.iTax) as procesUnitPriceusd,
+			max(so.iNatTax) as procesUnitPricermb,
+			max(so.iNatTax) * sum(shs.iQuantity) as processCost,
+			v.cVenName AS processUnit
+		 FROM
+			UFDATA_901_2021.dbo.SaleBillVouch sh
+			JOIN UFDATA_901_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
+			LEFT JOIN UFDATA_901_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
+			LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
+			JOIN (
+			 SELECT
+				supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax
+			 FROM UFDATA_901_2021.dbo.SO_SODetails s
+			 JOIN (
+					SELECT
+					 om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax
+					FROM UFDATA_901_2021.dbo.OM_MOMain om
+					 LEFT JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+					WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE CONCAT(#{code},'%')
+				) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode
+			) so ON so.iSOsID = rd.iorderdid
+		 LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
+		 group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
+
+		 union all
+
+		 SELECT
+			sh.cDefine10 AS invoiceNum,
+			CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ,
+			sum(shs.iQuantity) as shipQuantity,
+			sh.iExchRate AS exchangeRate,
+			sh.cSOCode AS orderNum,
+			c.cInvName AS poStyleNum,
+			sum(shs.iTaxUnitPrice) AS exportUnitPrice ,
+			sum(shs.iSum) as exportPrice,
+			sum(iNatSum) as rmbAmount,
+			max(so.iTax) as procesUnitPriceusd,
+			max(so.iNatTax) as procesUnitPricermb,
+			max(so.iNatTax) * sum(shs.iQuantity) as processCost,
+			v.cVenName AS processUnit
+		FROM
+			UFDATA_902_2021.dbo.SaleBillVouch sh
+			JOIN UFDATA_902_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
+			LEFT JOIN UFDATA_902_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
+			LEFT JOIN UFDATA_902_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
+		JOIN (
+			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax
+						FROM  UFDATA_903_2021.dbo.SO_SODetails a
+						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
+						inner JOIN (
+									 SELECT
+									 om.cCode AS omCode, od.csoordercode,
+									 om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+									 om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity ,od.iTax,od.iNatTax
+									 FROM
+									 UFDATA_903_2021.dbo.OM_MOMain om
+									 inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+									 WHERE
+									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
+									 ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
+						inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
+						inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode
+						inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+						inner join UFDATA_902_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+						inner join UFDATA_902_2021.dbo.po_podetails g on g.POID=f.POID
+						inner join UFDATA_902_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+						inner join UFDATA_902_2021.dbo.so_somain ss on ss.id=s.id
+						WHERE b.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%'
+			) so ON so.iSOsID = rd.iorderdid
+		LEFT JOIN UFDATA_902_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
+		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
+
+		union all
+
+		SELECT
+		sh.cDefine10 AS invoiceNum,
+		CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ,
+		sum(shs.iQuantity) as shipQuantity,
+		sh.iExchRate AS exchangeRate,
+		sh.cSOCode AS orderNum,
+		c.cInvName AS poStyleNum,
+		sum(shs.iTaxUnitPrice) AS exportUnitPrice ,
+		sum(shs.iSum) as exportPrice,
+		sum(iNatSum) as rmbAmount,
+		max(so.iTax) as procesUnitPriceusd,
+		max(so.iNatTax) as procesUnitPricermb,
+		max(so.iNatTax) * sum(shs.iQuantity) as processCost,
+		v.cVenName AS processUnit
+		 FROM
+			UFDATA_901_2021.dbo.SaleBillVouch sh
+			JOIN UFDATA_901_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
+			LEFT JOIN UFDATA_901_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
+			LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
+		  JOIN (
+			 SELECT  supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax
+						FROM  UFDATA_903_2021.dbo.SO_SODetails a
+						inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
+						inner JOIN (
+									 SELECT
+									 om.cCode AS omCode, od.csoordercode,
+									 om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+									 om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity ,od.iTax,od.iNatTax
+									 FROM
+									 UFDATA_903_2021.dbo.OM_MOMain om
+									 inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+									 WHERE
+									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
+									 ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
+						inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
+						inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode
+						inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+						inner join UFDATA_901_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+						inner join UFDATA_901_2021.dbo.po_podetails g on g.POID=f.POID
+						inner join UFDATA_901_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+						inner join UFDATA_901_2021.dbo.so_somain ss on ss.id=s.id
+						WHERE b.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%'
+			) so ON so.iSOsID = rd.iorderdid
+		LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
+		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
+
+	</select>
 </mapper>

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/ISyCostAllocationShipdetailService.java

@@ -13,4 +13,5 @@ import java.util.List;
 public interface ISyCostAllocationShipdetailService extends IService<SyCostAllocationShipdetail> {
 
 	public List<SyCostAllocationShipdetail> selectByMainId(String mainId);
+	List<SyCostAllocationShipdetail> queryByCostShipdetail(String code);
 }

+ 106 - 106
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -628,112 +628,112 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         }
 
         //发运明细
-        String sqlShipdetail = " SELECT      " +
-                                "  sh.cDefine10 AS invoiceNum,      " +
-                                "  CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ,    " +
-                                "  sum(shs.iQuantity) as shipQuantity,   " +
-                                "  sh.iExchRate AS exchangeRate,      " +
-                                "  sh.cSOCode AS orderNum,      " +
-                                "  c.cInvName AS poStyleNum,      " +
-                                "  sum(shs.iTaxUnitPrice) AS exportUnitPrice ,  " +
-                                "  sum(shs.iSum) as exportPrice, " +
-                                "  sum(iNatSum) as rmbAmount, " +
-                                "  max(so.iTax) as procesUnitPriceusd, " +
-                                "  max(so.iNatTax) as procesUnitPricermb, " +
-                                "  max(so.iNatTax) * sum(shs.iQuantity) as processCost, " +
-                                "  v.cVenName AS processUnit     " +
-                                " FROM      " +
-                                "  UFDATA_901_2021.dbo.SaleBillVouch sh      " +
-                                "  JOIN UFDATA_901_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID     " +
-                                "  LEFT JOIN UFDATA_901_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode       " +
-                                "  LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid      " +
-                                "  JOIN (      " +
-                                "   SELECT      " +
-                                "    supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax " +
-                                "   FROM UFDATA_901_2021.dbo.SO_SODetails s      " +
-                                "   JOIN (      " +
-                                "      SELECT      " +
-                                "       om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax " +
-                                "      FROM UFDATA_901_2021.dbo.OM_MOMain om      " +
-                                "       LEFT JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID       " +
-                                "      WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE '"+plannum+"%'   " +
-                                "    ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode       " +
-                                "  ) so ON so.iSOsID = rd.iorderdid    " +
-                                " LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode    " +
-                                " group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName  " +
-                "union all " +
-                            " SELECT  " +
-                            "    sh.cDefine10 AS invoiceNum,  " +
-                            "    CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ," +
-                            "    sum(shs.iQuantity) as shipQuantity, " +
-                            "    sh.iExchRate AS exchangeRate,  " +
-                            "    sh.cSOCode AS orderNum,  " +
-                            "    c.cInvName AS poStyleNum,  " +
-                            "    sum(shs.iTaxUnitPrice) AS exportUnitPrice ," +
-                            "    sum(shs.iSum) as exportPrice, " +
-                            "    sum(iNatSum) as rmbAmount, " +
-                            "    max(so.iTax) as procesUnitPriceusd, " +
-                            "    max(so.iNatTax) as procesUnitPricermb, " +
-                            "    max(so.iNatTax) * sum(shs.iQuantity) as processCost, " +
-                            "    v.cVenName AS processUnit " +
-                            "   FROM  " +
-                            "    UFDATA_902_2021.dbo.SaleBillVouch sh  " +
-                            "    JOIN UFDATA_902_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID " +
-                            "    LEFT JOIN UFDATA_902_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode   " +
-                            "    LEFT JOIN UFDATA_902_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid  " +
-                            "    JOIN (  " +
-                            "     SELECT  " +
-                            "      supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax " +
-                            "     FROM UFDATA_902_2021.dbo.SO_SODetails s  " +
-                            "     JOIN (  " +
-                            "        SELECT  " +
-                            "         om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax " +
-                            "        FROM UFDATA_902_2021.dbo.OM_MOMain om  " +
-                            "         LEFT JOIN UFDATA_902_2021.dbo.OM_MODetails od ON om.MOID = od.MOID   " +
-                            "        WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE '"+plannum+"%' " +
-                            "      ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode   " +
-                            "    ) so ON so.iSOsID = rd.iorderdid" +
-                            "   LEFT JOIN UFDATA_902_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode" +
-                            "   group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName "+
-                "union all " +
-                            " SELECT  " +
-                            "    sh.cDefine10 AS invoiceNum,  " +
-                            "    CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ," +
-                            "    sum(shs.iQuantity) as shipQuantity, " +
-                            "    sh.iExchRate AS exchangeRate,  " +
-                            "    sh.cSOCode AS orderNum,  " +
-                            "    c.cInvName AS poStyleNum,  " +
-                            "    sum(shs.iTaxUnitPrice) AS exportUnitPrice ," +
-                            "    sum(shs.iSum) as exportPrice, " +
-                            "    sum(iNatSum) as rmbAmount, " +
-                            "    max(so.iTax) as procesUnitPriceusd, " +
-                            "    max(so.iNatTax) as procesUnitPricermb, " +
-                            "    max(so.iNatTax) * sum(shs.iQuantity) as processCost, " +
-                            "    v.cVenName AS processUnit " +
-                            "   FROM  " +
-                            "    UFDATA_903_2021.dbo.SaleBillVouch sh  " +
-                            "    JOIN UFDATA_903_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID " +
-                            "    LEFT JOIN UFDATA_903_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode   " +
-                            "    LEFT JOIN UFDATA_903_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid  " +
-                            "    JOIN (  " +
-                            "     SELECT  " +
-                            "      supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax " +
-                            "     FROM UFDATA_903_2021.dbo.SO_SODetails s  " +
-                            "     JOIN (  " +
-                            "        SELECT  " +
-                            "         om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax " +
-                            "        FROM UFDATA_903_2021.dbo.OM_MOMain om  " +
-                            "         LEFT JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID   " +
-                            "        WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE '"+plannum+"%' " +
-                            "      ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode   " +
-                            "    ) so ON so.iSOsID = rd.iorderdid" +
-                            "   LEFT JOIN UFDATA_903_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode" +
-                            "   group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName ";
-        List<Map<String, Object>> listShipdetail  = senYuDataSourceOne.queryForList(sqlShipdetail);
-        List<JSONObject> Shipdetail = JsonChangeUtils.toJSONObject(listShipdetail);
-        List<SyCostAllocationShipdetail> Shipdetails = new ArrayList<>();
-        for (int i=0;i<Shipdetail.size();i++) {
-            SyCostAllocationShipdetail ship = JSONObject.toJavaObject(Shipdetail.get(i), SyCostAllocationShipdetail.class);
+//        String sqlShipdetail = " SELECT      " +
+//                                "  sh.cDefine10 AS invoiceNum,      " +
+//                                "  CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ,    " +
+//                                "  sum(shs.iQuantity) as shipQuantity,   " +
+//                                "  sh.iExchRate AS exchangeRate,      " +
+//                                "  sh.cSOCode AS orderNum,      " +
+//                                "  c.cInvName AS poStyleNum,      " +
+//                                "  sum(shs.iTaxUnitPrice) AS exportUnitPrice ,  " +
+//                                "  sum(shs.iSum) as exportPrice, " +
+//                                "  sum(iNatSum) as rmbAmount, " +
+//                                "  max(so.iTax) as procesUnitPriceusd, " +
+//                                "  max(so.iNatTax) as procesUnitPricermb, " +
+//                                "  max(so.iNatTax) * sum(shs.iQuantity) as processCost, " +
+//                                "  v.cVenName AS processUnit     " +
+//                                " FROM      " +
+//                                "  UFDATA_901_2021.dbo.SaleBillVouch sh      " +
+//                                "  JOIN UFDATA_901_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID     " +
+//                                "  LEFT JOIN UFDATA_901_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode       " +
+//                                "  LEFT JOIN UFDATA_901_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid      " +
+//                                "  JOIN (      " +
+//                                "   SELECT      " +
+//                                "    supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax " +
+//                                "   FROM UFDATA_901_2021.dbo.SO_SODetails s      " +
+//                                "   JOIN (      " +
+//                                "      SELECT      " +
+//                                "       om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax " +
+//                                "      FROM UFDATA_901_2021.dbo.OM_MOMain om      " +
+//                                "       LEFT JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID       " +
+//                                "      WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE '"+plannum+"%'   " +
+//                                "    ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode       " +
+//                                "  ) so ON so.iSOsID = rd.iorderdid    " +
+//                                " LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode    " +
+//                                " group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName  " +
+//                "union all " +
+//                            " SELECT  " +
+//                            "    sh.cDefine10 AS invoiceNum,  " +
+//                            "    CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ," +
+//                            "    sum(shs.iQuantity) as shipQuantity, " +
+//                            "    sh.iExchRate AS exchangeRate,  " +
+//                            "    sh.cSOCode AS orderNum,  " +
+//                            "    c.cInvName AS poStyleNum,  " +
+//                            "    sum(shs.iTaxUnitPrice) AS exportUnitPrice ," +
+//                            "    sum(shs.iSum) as exportPrice, " +
+//                            "    sum(iNatSum) as rmbAmount, " +
+//                            "    max(so.iTax) as procesUnitPriceusd, " +
+//                            "    max(so.iNatTax) as procesUnitPricermb, " +
+//                            "    max(so.iNatTax) * sum(shs.iQuantity) as processCost, " +
+//                            "    v.cVenName AS processUnit " +
+//                            "   FROM  " +
+//                            "    UFDATA_902_2021.dbo.SaleBillVouch sh  " +
+//                            "    JOIN UFDATA_902_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID " +
+//                            "    LEFT JOIN UFDATA_902_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode   " +
+//                            "    LEFT JOIN UFDATA_902_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid  " +
+//                            "    JOIN (  " +
+//                            "     SELECT  " +
+//                            "      supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax " +
+//                            "     FROM UFDATA_902_2021.dbo.SO_SODetails s  " +
+//                            "     JOIN (  " +
+//                            "        SELECT  " +
+//                            "         om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax " +
+//                            "        FROM UFDATA_902_2021.dbo.OM_MOMain om  " +
+//                            "         LEFT JOIN UFDATA_902_2021.dbo.OM_MODetails od ON om.MOID = od.MOID   " +
+//                            "        WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE '"+plannum+"%' " +
+//                            "      ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode   " +
+//                            "    ) so ON so.iSOsID = rd.iorderdid" +
+//                            "   LEFT JOIN UFDATA_902_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode" +
+//                            "   group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName "+
+//                "union all " +
+//                            " SELECT  " +
+//                            "    sh.cDefine10 AS invoiceNum,  " +
+//                            "    CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ," +
+//                            "    sum(shs.iQuantity) as shipQuantity, " +
+//                            "    sh.iExchRate AS exchangeRate,  " +
+//                            "    sh.cSOCode AS orderNum,  " +
+//                            "    c.cInvName AS poStyleNum,  " +
+//                            "    sum(shs.iTaxUnitPrice) AS exportUnitPrice ," +
+//                            "    sum(shs.iSum) as exportPrice, " +
+//                            "    sum(iNatSum) as rmbAmount, " +
+//                            "    max(so.iTax) as procesUnitPriceusd, " +
+//                            "    max(so.iNatTax) as procesUnitPricermb, " +
+//                            "    max(so.iNatTax) * sum(shs.iQuantity) as processCost, " +
+//                            "    v.cVenName AS processUnit " +
+//                            "   FROM  " +
+//                            "    UFDATA_903_2021.dbo.SaleBillVouch sh  " +
+//                            "    JOIN UFDATA_903_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID " +
+//                            "    LEFT JOIN UFDATA_903_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode   " +
+//                            "    LEFT JOIN UFDATA_903_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid  " +
+//                            "    JOIN (  " +
+//                            "     SELECT  " +
+//                            "      supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax " +
+//                            "     FROM UFDATA_903_2021.dbo.SO_SODetails s  " +
+//                            "     JOIN (  " +
+//                            "        SELECT  " +
+//                            "         om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax " +
+//                            "        FROM UFDATA_903_2021.dbo.OM_MOMain om  " +
+//                            "         LEFT JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID   " +
+//                            "        WHERE om.iVerifyStateNew = 2 AND om.cCode LIKE '"+plannum+"%' " +
+//                            "      ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode   " +
+//                            "    ) so ON so.iSOsID = rd.iorderdid" +
+//                            "   LEFT JOIN UFDATA_903_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode" +
+//                            "   group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName ";
+//        List<Map<String, Object>> listShipdetail  = senYuDataSourceOne.queryForList(sqlShipdetail);
+//        List<JSONObject> Shipdetail = JsonChangeUtils.toJSONObject(listShipdetail);
+        List<SyCostAllocationShipdetail> Shipdetails = syCostAllocationShipdetailMapper.queryByCostShipdetail(plannum);
+        for (int i=0;i<Shipdetails.size();i++) {
+            SyCostAllocationShipdetail ship = Shipdetails.get(i);
             Shipdetails.add(ship);
             //实际出货数量
             if(ship.getShipQuantity()!=null){

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationShipdetailServiceImpl.java

@@ -24,4 +24,9 @@ public class SyCostAllocationShipdetailServiceImpl extends ServiceImpl<SyCostAll
 	public List<SyCostAllocationShipdetail> selectByMainId(String mainId) {
 		return syCostAllocationShipdetailMapper.selectByMainId(mainId);
 	}
+
+	@Override
+	public List<SyCostAllocationShipdetail> queryByCostShipdetail(String code) {
+		return syCostAllocationShipdetailMapper.queryByCostShipdetail(code);
+	}
 }