|
|
@@ -5775,12 +5775,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" left join TP_MST_GoodsType on TP_MST_GoodsType.GoodsTypeID=TP_MST_Goods.GoodsTypeID " +
|
|
|
" left join TP_MST_Organization on TP_MST_Organization.OrganizationID=TP_PM_ProductionData.OrganizationID " +
|
|
|
" left join TP_MST_DATADICTIONARY on TP_MST_DATADICTIONARY.DICTIONARYID=TP_MST_Goods.GLAZETYPEID " +
|
|
|
- " left join tp_mst_logo on TP_PM_ProductionData.logoid=tp_mst_logo.logoid " +
|
|
|
" left join tp_mst_user cu on TP_PM_ProductionData.createuserid=cu.userid " +
|
|
|
" LEFT JOIN TP_PM_GroutingDailyDetail gdd\n" +
|
|
|
" ON gdd.Groutingdailydetailid = TP_PM_ProductionData.Groutingdailydetailid\n" +
|
|
|
+ // 2022年3月2日13:05:24 by feiy modify 都取注浆明细的商标，与追踪表保持一致
|
|
|
+ //" left join tp_mst_logo on TP_PM_ProductionData.logoid=tp_mst_logo.logoid " +
|
|
|
+ " left join tp_mst_logo on gdd.logoid=tp_mst_logo.logoid " +
|
|
|
|
|
|
- " Where TP_PM_ProductionData.ValueFlag = '1' " +
|
|
|
+ " Where TP_PM_ProductionData.ValueFlag = '1' " +
|
|
|
// 公坯、干补不算交坯工序的质量。
|
|
|
" and ((TP_PM_ProductionData.modeltype <> 5) or (TP_PM_ProductionData.modeltype = 5 and TP_PM_ProductionData.IsPublicBody = '0' and TP_PM_ProductionData.SpecialRepairFlag = '0')) \n" +
|
|
|
" and TP_PM_ProductionData.AccountID=:AccountID ";
|
liushiqi