成本分配 整理代码

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

@@ -188,94 +188,6 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         //查询U8数据 表头
         List<SyCostAllocation>  list =  syCostAllocationMapper.queryByCostHead(plannum);
         syCostAllocation = list.get(0);
-//        String sqlQueryhard = "SELECT     " +
-//                "  max(o.omCode) as planNum,max(c.cInvName) as poStyleNum,max(pe.cPersonName) as exportSales," +
-//                "  max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department," +
-//                "  max(cc.cCusAbbName) as customerShortame,v.cVenName as processUnit,max(ss.dDate) as outdata," +
-//                "  max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal," +
-//                "  sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity   " +
-//                "FROM  UFDATA_901_2021.dbo.SO_SODetails s    " +
-//                "LEFT JOIN UFDATA_901_2021.dbo.SO_SOMain ss on ss.ID= s.ID    " +
-//                "right JOIN (    " +
-//                "       SELECT     " +
-//                "       om.cCode AS omCode,    " +
-//                "       om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,    " +
-//                "       om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity     " +
-//                "       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    " +
-//                "LEFT JOIN UFDATA_901_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode    " +
-//                "LEFT JOIN UFDATA_901_2021.dbo.Inventory c on c.cInvCode=s.cInvCode    " +
-//                "LEFT JOIN UFDATA_901_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode    " +
-//                "LEFT JOIN UFDATA_901_2021.dbo.Department de ON ss.cDepCode = de.cDepCode    " +
-//                "LEFT JOIN UFDATA_901_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode    " +
-//                "WHERE c.cInvCcode like '19%' GROUP BY v.cVenName " +
-//
-//                "union all " +
-//
-//                "SELECT     " +
-//                "  max(o.omCode) as planNum,max(c.cInvName) as poStyleNum,max(pe.cPersonName) as exportSales," +
-//                "  max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department," +
-//                "  max(cc.cCusAbbName) as customerShortame,v.cVenName as processUnit,max(ss.dDate) as outdata," +
-//                "  max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal," +
-//                "  sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity   " +
-//                "FROM   UFDATA_902_2021.dbo.SO_SODetails s    " +
-//                "LEFT JOIN UFDATA_902_2021.dbo.SO_SOMain ss on ss.ID= s.ID    " +
-//                "right JOIN (    " +
-//                "       SELECT     " +
-//                "       om.cCode AS omCode,    " +
-//                "       om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,    " +
-//                "       om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity     " +
-//                "       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    " +
-//                "LEFT JOIN UFDATA_902_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode    " +
-//                "LEFT JOIN UFDATA_902_2021.dbo.Inventory c on c.cInvCode=s.cInvCode    " +
-//                "LEFT JOIN UFDATA_902_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode    " +
-//                "LEFT JOIN UFDATA_902_2021.dbo.Department de ON ss.cDepCode = de.cDepCode    " +
-//                "LEFT JOIN UFDATA_902_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode    " +
-//                "WHERE c.cInvCcode like '19%' GROUP BY v.cVenName " +
-//
-//                "union all " +
-//
-//                "SELECT     " +
-//                "  max(o.omCode) as planNum,max(c.cInvName) as poStyleNum,max(pe.cPersonName) as exportSales," +
-//                "  max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department," +
-//                "  max(cc.cCusAbbName) as customerShortame,v.cVenName as processUnit,max(ss.dDate) as outdata," +
-//                "  max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal," +
-//                "  sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity   " +
-//                "FROM  UFDATA_903_2021.dbo.SO_SODetails s    " +
-//                "LEFT JOIN UFDATA_903_2021.dbo.SO_SOMain ss on ss.ID= s.ID    " +
-//                "right JOIN (    " +
-//                "       SELECT     " +
-//                "       om.cCode AS omCode,    " +
-//                "       om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,    " +
-//                "       om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity     " +
-//                "       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    " +
-//                "LEFT JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode    " +
-//                "LEFT JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=s.cInvCode    " +
-//                "LEFT JOIN UFDATA_903_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode    " +
-//                "LEFT JOIN UFDATA_903_2021.dbo.Department de ON ss.cDepCode = de.cDepCode    " +
-//                "LEFT JOIN UFDATA_903_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode    " +
-//                "WHERE c.cInvCcode like '19%' GROUP BY v.cVenName ";
-//
-//        List<Map<String, Object>> list  = senYuDataSourceOne.queryForList(sqlQueryhard);
-//        if(list.size()==0){
-//            return null;
-//        }
-//        List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
-//        syCostAllocation = JSONObject.toJavaObject(jianSon.get(0), SyCostAllocation.class);
         /*如果出现多供应商的情况拼接 供应商*/
         for (int i=0;i<list.size();i++) {
             SyCostAllocation objs = list.get(i);
@@ -627,110 +539,7 @@ 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 = syCostAllocationShipdetailMapper.queryByCostShipdetail(plannum);
         for (int i=0;i<Shipdetails.size();i++) {
             SyCostAllocationShipdetail ship = Shipdetails.get(i);