|
|
@@ -336,7 +336,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" where rs1.cBatch = '"+plannum+"' " +
|
|
|
" ) b on r.cBatch = b.cBatch and b.cInvCode=r.cInvCode " +
|
|
|
" " +
|
|
|
- " LEFT JOIN (SELECT * FROM UFDATA_903_2021.dbo.Inventory where (cInvCCode like '03%' or cInvCCode like '04%' ) " +
|
|
|
+ " JOIN (SELECT * FROM UFDATA_903_2021.dbo.Inventory where (cInvCCode like '03%' or cInvCCode like '04%' ) " +
|
|
|
" and cInvCCode != '0399' and cInvCCode != '0499') c on c.cInvCode=r.cInvCode " +
|
|
|
" LEFT JOIN UFDATA_903_2021.dbo.Vendor v ON o.cVenCode= v.cVenCode " +
|
|
|
" GROUP BY c.cInvName,r.cBatch,b.cSource,b.cPOID,v.cVenName ,r.cInvCode " +
|
|
|
@@ -371,7 +371,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" where rs1.cBatch = '"+plannum+"' " +
|
|
|
" ) b on r.cBatch = b.cBatch and b.cInvCode=r.cInvCode " +
|
|
|
" " +
|
|
|
- " LEFT JOIN (SELECT * FROM Inventory where (cInvCCode like '03%' or cInvCCode like '04%' ) " +
|
|
|
+ " JOIN (SELECT * FROM Inventory where (cInvCCode like '03%' or cInvCCode like '04%' ) " +
|
|
|
" and cInvCCode != '0399' and cInvCCode != '0499') c on c.cInvCode=r.cInvCode " +
|
|
|
" LEFT JOIN Vendor v ON o.cVenCode= v.cVenCode " +
|
|
|
" GROUP BY c.cInvName,r.cBatch,b.cSource,b.cPOID,v.cVenName ,r.cInvCode " +
|
|
|
@@ -475,40 +475,75 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
|
|
|
|
|
|
|
|
|
- String sqlIngredient ="SELECT cInvName as goodsName,sum(yi) as usageQuantity,sum(gou) as purchaseQuantity," +
|
|
|
- "processUnit,isnull(sum(gou),0)-isnull(sum(yuu),0) as ingredientsRemainingQuantity,sum(yu) as ingredientsTransferQuantity, " +
|
|
|
- "sum(transferCost) as transferCost,sum(rmbAmount) as rmbAmount,sum(usdAmount) as usdAmount,sum(priceExcludingtax) as priceExcludingtax " +
|
|
|
- "FROM ( " +
|
|
|
- " select sum(r.iQuantity) as yu,r.cBatch ,b.cSource,b.cPOID,sum(b.gou) as gou,sum(b.yi) as yi,sum(b.ying) as ying " +
|
|
|
- " ,c.cInvName ,v.cVenName as processUnit,sum(b.iCost) as transferCost,sum(b.iMoney) as rmbAmount,sum(b.iOriMoney) as usdAmount,sum(b.iTaxPrice) as priceExcludingtax ,( " +
|
|
|
- " SELECT sum(r.iQuantity) " +
|
|
|
- " FROM rdrecords01 rs1 " +
|
|
|
- " left join rdrecord01 r1 on r1.id=rs1.id " +
|
|
|
- " where rs1.cBatch = '"+plannum+"' and rs1.cPOID like '"+plannum+"%' and " +
|
|
|
- " r.cBatch = rs1.cBatch and rs1.cInvCode=r.cInvCode " +
|
|
|
- " group by rs1.cInvCode, rs1.cBatch ) as yuu " +
|
|
|
- " FROM rdrecords11 r " +
|
|
|
- " JOIN ( " +
|
|
|
- " SELECT od.MODetailsID,od.cInvCode,om.cVenCode " +
|
|
|
- " 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 r.iOMoDID = o.MODetailsID " +
|
|
|
- " LEFT JOIN ( " +
|
|
|
- " SELECT r1.id,r1.cSource,rs1.cBatch,rs1.cInvCode ,rs1.cPOID, " +
|
|
|
- " rs1.iQuantity as gou,isnull(od.iQuantity,0)+isnull(p.iQuantity,0) as ying,isnull(od.iSendQTY,0)+isnull(p.iQuantity,0) as yi," +
|
|
|
- "bi.iCost,bi.iMoney,bi.iOriMoney,bi.iTaxPrice " +
|
|
|
- " FROM rdrecords01 rs1 " +
|
|
|
- " left join rdrecord01 r1 on r1.id=rs1.id " +
|
|
|
- " left join PO_Podetails p on p.ID=rs1.iPOsID " +
|
|
|
- " left join PurBillVouchs bi on bi.iPOsID=p.ID " +
|
|
|
- " left join OM_MODetails o on o.MODetailsID =rs1.iOMoDID " +
|
|
|
- " left join OM_MOMaterials od on od.MoDetailsID=o.MODetailsID " +
|
|
|
- " where rs1.cBatch = '"+plannum+"' " +
|
|
|
- " ) b on r.cBatch = b.cBatch and b.cInvCode=r.cInvCode " +
|
|
|
- " LEFT JOIN (SELECT * FROM Inventory where (cInvCCode like '05%' or cInvCCode like '06%' or cInvCCode like '07%' ) ) c on c.cInvCode=r.cInvCode" +
|
|
|
- " LEFT JOIN Vendor v ON o.cVenCode= v.cVenCode " +
|
|
|
- " GROUP BY c.cInvName,r.cBatch,b.cSource,b.cPOID,v.cVenName ,r.cInvCode " +
|
|
|
- " ) as ta GROUP BY cInvName,processUnit;";
|
|
|
+ String sqlIngredient ="SELECT " +
|
|
|
+ "cInvName as goodsName,sum(yi) as usageQuantity,sum(gou) as purchaseQuantity,processUnit, " +
|
|
|
+ "isnull(sum(gou),0)-isnull(sum(yuu),0) as ingredientsRemainingQuantity,sum(yu) as ingredientsTransferQuantity, " +
|
|
|
+ "sum(transferCost) as transferCost,sum(rmbAmount) as rmbAmount,sum(usdAmount) as usdAmount,sum(priceExcludingtax) as priceExcludingtax " +
|
|
|
+ "FROM ( " +
|
|
|
+ " select sum(r.iQuantity) as yu,r.cBatch ,b.cSource,b.cPOID,sum(b.gou) as gou,sum(b.yi) as yi,sum(b.ying) as ying,c.cInvName, " +
|
|
|
+ " v.cVenName as processUnit,sum(b.iCost) as transferCost,sum(b.iMoney) as rmbAmount,sum(b.iOriMoney) as usdAmount, " +
|
|
|
+ " sum(b.iTaxPrice) as priceExcludingtax ,( " +
|
|
|
+ " SELECT sum(r.iQuantity) FROM rdrecords01 rs1 " +
|
|
|
+ " left join rdrecord01 r1 on r1.id=rs1.id " +
|
|
|
+ " where rs1.cBatch = '"+plannum+"' and rs1.cPOID like '"+plannum+"%' and " +
|
|
|
+ " r.cBatch = rs1.cBatch and rs1.cInvCode=r.cInvCode " +
|
|
|
+ " group by rs1.cInvCode, rs1.cBatch ) as yuu " +
|
|
|
+ " FROM UFDATA_903_2021.dbo.rdrecords11 r " +
|
|
|
+ " JOIN ( " +
|
|
|
+ " SELECT od.MODetailsID,od.cInvCode,om.cVenCode " +
|
|
|
+ " 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 r.iOMoDID = o.MODetailsID " +
|
|
|
+ " JOIN ( " +
|
|
|
+ " SELECT r1.id,r1.cSource,rs1.cBatch,rs1.cInvCode ,rs1.cPOID,rs1.iQuantity as gou, " +
|
|
|
+ " isnull(od.iQuantity,0)+ isnull(p.iQuantity,0) as ying,isnull(od.iSendQTY,0)+ isnull(p.iQuantity,0) as yi, " +
|
|
|
+ " bi.iCost,bi.iMoney,bi.iOriMoney,bi.iTaxPrice " +
|
|
|
+ " FROM UFDATA_903_2021.dbo.rdrecords01 rs1 " +
|
|
|
+ " left join UFDATA_903_2021.dbo.rdrecord01 r1 on r1.id=rs1.id " +
|
|
|
+ " left join UFDATA_903_2021.dbo.PO_Podetails p on p.ID=rs1.iPOsID " +
|
|
|
+ " left join UFDATA_903_2021.dbo.PurBillVouchs bi on bi.iPOsID=p.ID " +
|
|
|
+ " left join UFDATA_903_2021.dbo.OM_MODetails o on o.MODetailsID =rs1.iOMoDID " +
|
|
|
+ " left join UFDATA_903_2021.dbo.OM_MOMaterials od on od.MoDetailsID=o.MODetailsID " +
|
|
|
+ " where rs1.cBatch = '"+plannum+"' " +
|
|
|
+ " ) b on r.cBatch = b.cBatch and b.cInvCode=r.cInvCode " +
|
|
|
+ " JOIN (SELECT * FROM Inventory " +
|
|
|
+ " where (cInvCCode like '05%' or cInvCCode like '06%' or cInvCCode like '07%' ) ) c on c.cInvCode=r.cInvCode " +
|
|
|
+ " LEFT JOIN UFDATA_903_2021.dbo.Vendor v ON o.cVenCode= v.cVenCode " +
|
|
|
+ " GROUP BY c.cInvName,r.cBatch,b.cSource,b.cPOID,v.cVenName ,r.cInvCode " +
|
|
|
+ " " +
|
|
|
+ " union all " +
|
|
|
+ " " +
|
|
|
+ " select sum(r.iQuantity) as yu,r.cBatch ,b.cSource,b.cPOID,sum(b.gou) as gou,sum(b.yi) as yi,sum(b.ying) as ying,c.cInvName, " +
|
|
|
+ " v.cVenName as processUnit,sum(b.iCost) as transferCost,sum(b.iMoney) as rmbAmount,sum(b.iOriMoney) as usdAmount, " +
|
|
|
+ " sum(b.iTaxPrice) as priceExcludingtax ,( " +
|
|
|
+ " SELECT sum(r.iQuantity) FROM rdrecords01 rs1 " +
|
|
|
+ " left join rdrecord01 r1 on r1.id=rs1.id " +
|
|
|
+ " where rs1.cBatch = '"+plannum+"' and rs1.cPOID like '"+plannum+"%' and " +
|
|
|
+ " r.cBatch = rs1.cBatch and rs1.cInvCode=r.cInvCode " +
|
|
|
+ " group by rs1.cInvCode, rs1.cBatch ) as yuu " +
|
|
|
+ " FROM rdrecords11 r " +
|
|
|
+ " JOIN ( " +
|
|
|
+ " SELECT od.MODetailsID,od.cInvCode,om.cVenCode " +
|
|
|
+ " 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 r.iOMoDID = o.MODetailsID " +
|
|
|
+ " JOIN ( " +
|
|
|
+ " SELECT r1.id,r1.cSource,rs1.cBatch,rs1.cInvCode ,rs1.cPOID,rs1.iQuantity as gou, " +
|
|
|
+ " isnull(od.iQuantity,0)+ isnull(p.iQuantity,0) as ying,isnull(od.iSendQTY,0)+ isnull(p.iQuantity,0) as yi, " +
|
|
|
+ " bi.iCost,bi.iMoney,bi.iOriMoney,bi.iTaxPrice " +
|
|
|
+ " FROM rdrecords01 rs1 " +
|
|
|
+ " left join rdrecord01 r1 on r1.id=rs1.id " +
|
|
|
+ " left join PO_Podetails p on p.ID=rs1.iPOsID " +
|
|
|
+ " left join PurBillVouchs bi on bi.iPOsID=p.ID " +
|
|
|
+ " left join OM_MODetails o on o.MODetailsID =rs1.iOMoDID " +
|
|
|
+ " left join OM_MOMaterials od on od.MoDetailsID=o.MODetailsID " +
|
|
|
+ " where rs1.cBatch = '"+plannum+"' " +
|
|
|
+ " ) b on r.cBatch = b.cBatch and b.cInvCode=r.cInvCode " +
|
|
|
+ " JOIN (SELECT * FROM Inventory " +
|
|
|
+ " where (cInvCCode like '05%' or cInvCCode like '06%' or cInvCCode like '07%' ) ) c on c.cInvCode=r.cInvCode " +
|
|
|
+ " LEFT JOIN Vendor v ON o.cVenCode= v.cVenCode " +
|
|
|
+ " GROUP BY c.cInvName,r.cBatch,b.cSource,b.cPOID,v.cVenName ,r.cInvCode " +
|
|
|
+ " ) as ta GROUP BY cInvName,processUnit";
|
|
|
List<Map<String, Object>> list2 = senYuDataSourceOne.queryForList(sqlIngredient);
|
|
|
List<JSONObject> jianSon2 = JsonChangeUtils.toJSONObject(list2);
|
|
|
List<SyCostAllocationIngredient> list4 = new ArrayList<>();
|
|
|
@@ -808,10 +843,12 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" sp.cMaker as preparedBy, " +
|
|
|
" sps.cExpCode as expenseItem, " +
|
|
|
" sps.iMoney as disbursedLocalmoney, " +
|
|
|
+ " v.cVenName as processUnit," +
|
|
|
" sps.INatMoney as disbursedOriginalmoney " +
|
|
|
"FROM " +
|
|
|
" UFDATA_901_2021.dbo.SalePayVouch sp " +
|
|
|
" INNER JOIN UFDATA_901_2021.dbo.SalePayVouchs sps ON sp.id = sps.id " +
|
|
|
+ " LEFT JOIN Vendor v ON sp.cvencode= v.cVenCode " +
|
|
|
" where sp.cSOCode " +
|
|
|
"in ( " +
|
|
|
" SELECT s.cSOCode FROM UFDATA_901_2021.dbo.SO_SODetails s " +
|
|
|
@@ -829,10 +866,12 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" sp.cMaker as preparedBy, " +
|
|
|
" sps.cExpCode as expenseItem, " +
|
|
|
" sps.iMoney as disbursedLocalmoney, " +
|
|
|
+ " v.cVenName as processUnit," +
|
|
|
" sps.INatMoney as disbursedOriginalmoney " +
|
|
|
" FROM " +
|
|
|
" UFDATA_902_2021.dbo.SalePayVouch sp " +
|
|
|
" INNER JOIN UFDATA_902_2021.dbo.SalePayVouchs sps ON sp.id = sps.id " +
|
|
|
+ " LEFT JOIN Vendor v ON sp.cvencode= v.cVenCode " +
|
|
|
" where sp.cSOCode " +
|
|
|
" in ( " +
|
|
|
" SELECT s.cSOCode FROM SO_SODetails s " +
|
|
|
@@ -850,10 +889,12 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" sp.cMaker as preparedBy, " +
|
|
|
" sps.cExpCode as expenseItem, " +
|
|
|
" sps.iMoney as disbursedLocalmoney, " +
|
|
|
+ " v.cVenName as processUnit," +
|
|
|
" sps.INatMoney as disbursedOriginalmoney " +
|
|
|
" FROM " +
|
|
|
" UFDATA_903_2021.dbo.SalePayVouch sp " +
|
|
|
" INNER JOIN UFDATA_903_2021.dbo.SalePayVouchs sps ON sp.id = sps.id " +
|
|
|
+ " LEFT JOIN Vendor v ON sp.cvencode= v.cVenCode " +
|
|
|
" where sp.cSOCode " +
|
|
|
" in ( " +
|
|
|
" SELECT s.cSOCode FROM SO_SODetails s " +
|
