|
|
@@ -630,25 +630,92 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" max(so.iNatTax) * sum(shs.iQuantity) as processCost, " +
|
|
|
" v.cVenName AS processUnit " +
|
|
|
" FROM " +
|
|
|
- " SaleBillVouch sh " +
|
|
|
- " JOIN SaleBillVouchs shs ON sh.SBVID = shs.SBVID " +
|
|
|
- " LEFT JOIN Inventory c ON c.cInvCode= shs.cInvCode " +
|
|
|
- " LEFT JOIN rdrecords32 rd ON rd.AutoID = shs.isaleoutid " +
|
|
|
+ " 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 SO_SODetails s " +
|
|
|
+ " FROM UFDATA_901_2021.dbo.SO_SODetails s " +
|
|
|
" JOIN ( " +
|
|
|
" SELECT " +
|
|
|
" om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iTax,od.iNatTax " +
|
|
|
- " FROM OM_MOMain om " +
|
|
|
- " LEFT JOIN OM_MODetails od ON om.MOID = od.MOID " +
|
|
|
+ " 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 Vendor v ON so.supplierCode= v.cVenCode " +
|
|
|
- " group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName ; ";
|
|
|
- //" WHERE sh.cSOCode = '"+syCostAllocation.getGarmentContractno()+"'";
|
|
|
+ " 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<>();
|
|
|
@@ -700,25 +767,67 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
|
|
|
//费用支出
|
|
|
String sqlCostpay = "SELECT 901 as setNo, " +
|
|
|
- " sp.cSPVCode as disbursementSlipNo, " +
|
|
|
- " sp.cDefine10 as invoicenum, " +
|
|
|
- " sp.cMaker as preparedBy, " +
|
|
|
- " sps.cExpCode as expenseItem, " +
|
|
|
- " sps.iMoney as disbursedLocalmoney, " +
|
|
|
- " sps.INatMoney as disbursedOriginalmoney " +
|
|
|
- "FROM " +
|
|
|
- " SalePayVouch sp " +
|
|
|
- " INNER JOIN SalePayVouchs sps ON sp.id = sps.id " +
|
|
|
- " where sp.cSOCode " +
|
|
|
- "in ( " +
|
|
|
- " SELECT s.cSOCode FROM SO_SODetails s " +
|
|
|
- " JOIN ( " +
|
|
|
- " SELECT od.cInvCode,od.isosid FROM OM_MOMain om " +
|
|
|
- " LEFT JOIN 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 " +
|
|
|
- " GROUP BY s.cSOCode " +
|
|
|
- " )";
|
|
|
+ " sp.cSPVCode as disbursementSlipNo, " +
|
|
|
+ " sp.cDefine10 as invoicenum, " +
|
|
|
+ " sp.cMaker as preparedBy, " +
|
|
|
+ " sps.cExpCode as expenseItem, " +
|
|
|
+ " sps.iMoney as disbursedLocalmoney, " +
|
|
|
+ " sps.INatMoney as disbursedOriginalmoney " +
|
|
|
+ "FROM " +
|
|
|
+ " UFDATA_901_2021.dbo.SalePayVouch sp " +
|
|
|
+ " INNER JOIN UFDATA_901_2021.dbo.SalePayVouchs sps ON sp.id = sps.id " +
|
|
|
+ " where sp.cSOCode " +
|
|
|
+ "in ( " +
|
|
|
+ " SELECT s.cSOCode FROM UFDATA_901_2021.dbo.SO_SODetails s " +
|
|
|
+ " JOIN ( " +
|
|
|
+ " SELECT od.cInvCode,od.isosid 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 " +
|
|
|
+ " GROUP BY s.cSOCode " +
|
|
|
+ " )"+
|
|
|
+ " union all "+
|
|
|
+ " SELECT 902 as setNo, " +
|
|
|
+ " sp.cSPVCode as disbursementSlipNo, " +
|
|
|
+ " sp.cDefine10 as invoicenum, " +
|
|
|
+ " sp.cMaker as preparedBy, " +
|
|
|
+ " sps.cExpCode as expenseItem, " +
|
|
|
+ " sps.iMoney as disbursedLocalmoney, " +
|
|
|
+ " sps.INatMoney as disbursedOriginalmoney " +
|
|
|
+ " FROM " +
|
|
|
+ " UFDATA_902_2021.dbo.SalePayVouch sp " +
|
|
|
+ " INNER JOIN UFDATA_902_2021.dbo.SalePayVouchs sps ON sp.id = sps.id " +
|
|
|
+ " where sp.cSOCode " +
|
|
|
+ " in ( " +
|
|
|
+ " SELECT s.cSOCode FROM SO_SODetails s " +
|
|
|
+ " JOIN ( " +
|
|
|
+ " SELECT od.cInvCode,od.isosid 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 " +
|
|
|
+ " GROUP BY s.cSOCode " +
|
|
|
+ " )"+
|
|
|
+ " union all "+
|
|
|
+ " SELECT 903 as setNo, " +
|
|
|
+ " sp.cSPVCode as disbursementSlipNo, " +
|
|
|
+ " sp.cDefine10 as invoicenum, " +
|
|
|
+ " sp.cMaker as preparedBy, " +
|
|
|
+ " sps.cExpCode as expenseItem, " +
|
|
|
+ " sps.iMoney as disbursedLocalmoney, " +
|
|
|
+ " sps.INatMoney as disbursedOriginalmoney " +
|
|
|
+ " FROM " +
|
|
|
+ " UFDATA_903_2021.dbo.SalePayVouch sp " +
|
|
|
+ " INNER JOIN UFDATA_903_2021.dbo.SalePayVouchs sps ON sp.id = sps.id " +
|
|
|
+ " where sp.cSOCode " +
|
|
|
+ " in ( " +
|
|
|
+ " SELECT s.cSOCode FROM SO_SODetails s " +
|
|
|
+ " JOIN ( " +
|
|
|
+ " SELECT od.cInvCode,od.isosid 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 " +
|
|
|
+ " GROUP BY s.cSOCode " +
|
|
|
+ " )";
|
|
|
List<Map<String, Object>> costpayList = senYuDataSourceOne.queryForList(sqlCostpay);
|
|
|
List<JSONObject> costpay = JsonChangeUtils.toJSONObject(costpayList);
|
|
|
List<SyCostAllocationCostpay> syCostAllocationCostpays = new ArrayList<>();
|
