|
|
@@ -7666,15 +7666,22 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,t_over.goodscode\n" +
|
|
|
" ,t_over.goodstypename\n" +
|
|
|
" ,t_over.goodstypename2\n" +
|
|
|
- //" ,pd.createtime ptime\n" +
|
|
|
//" ,t_over.overprocedurename\n" +
|
|
|
//" ,t_over.overusercode\n" +
|
|
|
//" ,t_over.overtime\n" +
|
|
|
+ //2021-06-22 lsq 黄绵哲需求
|
|
|
+ //begin
|
|
|
+ " ,t_over.createtime otime\n" +
|
|
|
+ //end
|
|
|
" ,t_over.groutingusercode\n" +
|
|
|
" ,pd.groutinglinecode\n" +
|
|
|
" ,pd.groutingmouldcode\n" +
|
|
|
" ,t_over.groutingdate Gdate\n" +
|
|
|
" ,t_over.DELIVERTIME Ddate\n" +
|
|
|
+ //2021-06-22 dy 黄绵哲需求
|
|
|
+ //begin
|
|
|
+ " ,pd.createtime ptime\n" +
|
|
|
+ //end
|
|
|
" ,decode(logo.logoid, null, '', logo.Logoname||'['||logo.Logocode||']') as LogoCodeName " +
|
|
|
" FROM tp_pm_productiondata pd\n" +
|
|
|
" LEFT JOIN tp_pc_procedure pcp\n" +
|
|
|
@@ -7692,6 +7699,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
//" ,pd.createtime overtime\n" +
|
|
|
" ,pd.groutingusercode\n" +
|
|
|
" ,pd.groutingdate\n" +
|
|
|
+ " ,pd.createtime\n" +
|
|
|
" ,gdd.DELIVERTIME\n" +
|
|
|
" FROM tp_pm_productiondata pd\n" +
|
|
|
" LEFT JOIN tp_mst_goods goods\n" +
|
|
|
@@ -10121,6 +10129,11 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,pmd.UserCode\n" +
|
|
|
" ,pmd.username\n" +
|
|
|
" ,gt.Goodstypename\n" +
|
|
|
+ " ,gt.GOODSTYPECode\n" +
|
|
|
+ " , CASE\n" +
|
|
|
+ "WHEN instr(gt.GOODSTYPECode,'001001') = 1 THEN '大件'\n" +
|
|
|
+ "WHEN instr(gt.GOODSTYPECode,'001002') = 1 THEN '小件'\n" +
|
|
|
+ "END AS GoodsTYPE\n"+
|
|
|
" ,pmd.goodscode\n" +
|
|
|
" ,pmd.barcode\n" +
|
|
|
" ,pd.groutingdate\n" +
|
liusq