|
@@ -198,8 +198,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
" GDD.UserCode," +
|
|
" GDD.UserCode," +
|
|
|
// 产品编码
|
|
// 产品编码
|
|
|
" GDD.GoodsCode," +
|
|
" GDD.GoodsCode," +
|
|
|
- // 产品名称
|
|
|
|
|
- " GDD.GoodsName," +
|
|
|
|
|
|
|
+ // 产品名称 20210728 modify lsq goodsname不取TP_PM_GroutingDailyDetail，取TP_MST_GOODS的
|
|
|
|
|
+ " G.GoodsName," +
|
|
|
// 注浆线模具编码
|
|
// 注浆线模具编码
|
|
|
" GDD.GroutingMouldCode," +
|
|
" GDD.GroutingMouldCode," +
|
|
|
// 模具状态
|
|
// 模具状态
|
|
@@ -224,6 +224,11 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
" U.UserName AS Createuser" +
|
|
" U.UserName AS Createuser" +
|
|
|
// 注浆日报明细表
|
|
// 注浆日报明细表
|
|
|
" FROM TP_PM_GroutingDailyDetail GDD" +
|
|
" FROM TP_PM_GroutingDailyDetail GDD" +
|
|
|
|
|
+ //20210728 modify lsq goodsname不取TP_PM_GroutingDailyDetail，取TP_MST_GOODS的
|
|
|
|
|
+ //BEGIN
|
|
|
|
|
+ " INNER JOIN TP_MST_Goods G" +
|
|
|
|
|
+ " ON G.GoodsID = GDD.GoodsID" +
|
|
|
|
|
+ //END
|
|
|
// 注浆日报
|
|
// 注浆日报
|
|
|
" INNER JOIN TP_PM_GroutingDaily GD" +
|
|
" INNER JOIN TP_PM_GroutingDaily GD" +
|
|
|
" ON GD.GroutingDailyID = GDD.GroutingDailyID" +
|
|
" ON GD.GroutingDailyID = GDD.GroutingDailyID" +
|
liusq