|
|
@@ -2040,9 +2040,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
,STAFF.STAFFNAME
|
|
|
FROM
|
|
|
TP_PM_InProduction
|
|
|
- INNER JOIN TP_MST_User A ON A.UserID = TP_PM_InProduction.Userid
|
|
|
- INNER JOIN TP_MST_User B ON B.UserID = TP_PM_InProduction.CreateUserID
|
|
|
- INNER JOIN TP_MST_User C ON C.UserID = TP_PM_InProduction.UpdateUserID
|
|
|
+ LEFT JOIN TP_MST_User A ON A.UserID = TP_PM_InProduction.Userid
|
|
|
+ LEFT JOIN TP_MST_User B ON B.UserID = TP_PM_InProduction.CreateUserID
|
|
|
+ LEFT JOIN TP_MST_User C ON C.UserID = TP_PM_InProduction.UpdateUserID
|
|
|
INNER JOIN TP_PC_Procedure D ON D.PROCEDUREID = TP_PM_InProduction.ProcedureID
|
|
|
INNER JOIN TP_MST_GMouldType ON TP_MST_GMouldType.GMouldTypeID = TP_PM_InProduction.GMouldTypeID
|
|
|
INNER JOIN TP_SYS_ProcedureModelType ON TP_SYS_ProcedureModelType.ProcedureModelTypeID = TP_PM_InProduction.ModelType
|
|
|
@@ -2055,7 +2055,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
LEFT JOIN TP_MST_Logo ON TP_PM_InProduction.logoid = TP_MST_Logo.logoid
|
|
|
LEFT JOIN TP_MST_Goods Goods ON TP_PM_InProduction.GoodsID = Goods.GoodsID
|
|
|
LEFT JOIN tp_mst_goodstype gt ON gt.goodstypeid = Goods.goodstypeid
|
|
|
- INNER JOIN TP_PM_PRODUCTIONDATA PD ON TP_PM_InProduction.BARCODE = PD.BARCODE
|
|
|
+ LEFT JOIN TP_PM_PRODUCTIONDATA PD ON TP_PM_InProduction.BARCODE = PD.BARCODE
|
|
|
AND TP_PM_InProduction.FLOWPROCEDUREID = PD.PROCEDUREID
|
|
|
LEFT JOIN (
|
|
|
SELECT
|