|
|
@@ -8734,7 +8734,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,g.scrapcount\n" +
|
|
|
" ,g.barscrapcount\n" +
|
|
|
" ,g.delivercount\n" +
|
|
|
- " ,g.barcodecount - g.barscrapcount - g.delivercount incount\n" +
|
|
|
+ " ,g.barcodecount - g.barscrapcount - g.delivercount - g.bycount incount\n" +
|
|
|
" FROM (SELECT grouping_id(gdd.goodstypename2, gdd.goodscode, gdd.usercode) gid\n" +
|
|
|
" ,gdd.goodstypename2\n" +
|
|
|
" ,gdd.goodstypename\n" +
|
|
|
@@ -8746,6 +8746,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,SUM(scrapcount) scrapcount\n" +
|
|
|
" ,SUM(barscrapcount) barscrapcount\n" +
|
|
|
" ,SUM(delivercount) delivercount\n" +
|
|
|
+ " ,SUM(bycount) bycount\n" +
|
|
|
" FROM (SELECT gt2.goodstypename goodstypename2\n" +
|
|
|
" ,gdd.usercode\n" +
|
|
|
" ,mu.usercode as MONITORName\n" +
|
|
|
@@ -8791,9 +8792,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" 0\n" +
|
|
|
" END delivercount\n" +
|
|
|
" , CASE\n" +
|
|
|
- " WHEN TPS.CREATETIME >= :gdatabegin AND\n" +
|
|
|
- " TPS.CREATETIME <= :gdataend AND\n" +
|
|
|
- " TPS.BARCODE IS NOT NULL THEN\n" +
|
|
|
+ " WHEN TPS.BARCODE IS NOT NULL THEN\n" +
|
|
|
" 1\n" +
|
|
|
" ELSE\n" +
|
|
|
" 0\n" +
|
|
|
@@ -8816,8 +8815,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" AND gt2.accountid = gt.accountid\n" +
|
|
|
" LEFT JOIN(\n" +
|
|
|
" SELECT DISTINCT\n" +
|
|
|
- " TPS.BARCODE,\n" +
|
|
|
- " TPS.CREATETIME\n" +
|
|
|
+ " TPS.BARCODE\n" +
|
|
|
" FROM\n" +
|
|
|
" TP_PM_SEMICHECK TPS\n" +
|
|
|
" LEFT JOIN TP_PM_GROUTINGDAILYDETAIL TPGD ON TPS.BARCODE = TPGD.BARCODE\n" +
|
|
|
@@ -8825,8 +8823,11 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" TPGD.CREATETIME >= :gdatabegin\n" +
|
|
|
" AND TPGD.CREATETIME <= :gdataend\n" +
|
|
|
" AND(TPS.SEMICHECKTYPE = 2 OR TPS.RESEMICHECKTYPE = 2)\n" +
|
|
|
+ " AND TPGD.VALUEFLAG = 1\n" +
|
|
|
+ " AND TPGD.SCRAPFLAG = 0\n" +
|
|
|
" AND DELIVERFLAG = 0\n" +
|
|
|
- " ORDER BY TPGD.CREATETIME\n" +
|
|
|
+ " AND TPS.CREATETIME >= :gdatabegin\n" +
|
|
|
+ " AND TPS.CREATETIME <= :gdataend\n" +
|
|
|
" ) TPS ON TPS.BARCODE = gdd.BARCODE\n" +
|
|
|
" WHERE gdd.valueflag = '1'\n" +
|
|
|
" AND gdd.groutingflag = '1'\n" +
|
ztl