فهرست منبع

成本报表 发运明细费用

liuchaohui 2 سال پیش
والد
کامیت
2fa769e9c3

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

@@ -453,34 +453,39 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         }
 
         //发运明细
-        String sqlShipdetail = "SELECT  " +
-                "  sh.cDefine10 AS invoiceNum,  " +
-                "  CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ," +
-                "  count(shs.SBVID) as shipQuantity,"+
-                "  sh.iExchRate AS exchangeRate,  " +
-                "  sh.cSOCode AS orderNum,  " +
-                "  c.cInvName AS poStyleNum,  " +
-                "  sum(shs.iTaxUnitPrice) AS exportUnitPrice ,  " +
-                "  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  " +
-                "   JOIN (  " +
-                "    SELECT  " +
-                "      supplierCode,s.iSOsID,s.id  " +
-                "    FROM SO_SODetails s  " +
-                "     JOIN (  " +
-                "          SELECT  " +
-                "            om.cVenCode AS supplierCode,od.cInvCode,od.isosid   " +
-                "          FROM OM_MOMain om  " +
-                "            LEFT JOIN OM_MODetails od ON om.MOID = od.MOID   " +
-                "          WHERE om.cState = 1 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 ";
+        String sqlShipdetail = " SELECT      " +
+                                "  sh.cDefine10 AS invoiceNum,      " +
+                                "  CONVERT(varchar (100), max(sh.dcreatesystime), 23) as outdata ,    " +
+                                "  count(shs.SBVID) 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) * count(shs.SBVID) 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      " +
+                                "  JOIN (      " +
+                                "   SELECT      " +
+                                "    supplierCode,s.iSOsID,s.id ,o.iTax,o.iNatTax " +
+                                "   FROM 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       " +
+                                "      WHERE om.cState = 1 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()+"'";
         List<Map<String, Object>> listShipdetail  = senYuDataSourceOne.queryForList(sqlShipdetail);
         List<JSONObject> Shipdetail = JsonChangeUtils.toJSONObject(listShipdetail);