|
@@ -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){
|