修复未注浆的不可以报损

DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -1839,10 +1839,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             try
             {
                 conn.Connect();
-                //在产产品不可以报损
+                //未注浆/在产/报损 不可以报损 xuwei modify 2019-11-25
                 if (sre.Status == Constant.ServiceResultStatus.Success)
                 {
-                    //报损时验证是否重复报损，撤销时验证是否重复撤销
                     sqlStr = $@"
                         SELECT 
                             COUNT(GROUTINGDAILYDETAILID) 
@@ -1850,7 +1849,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                             TP_PM_GROUTINGDAILYDETAIL
                         WHERE 
                             ACCOUNTID = {sUser.AccountID}
-                            AND (BEGINNINGFLAG = '1' OR SCRAPFlAG = '{scrapFlag}') 
+                            AND (BEGINNINGFLAG = '1' OR SCRAPFlAG = '{scrapFlag}' OR GROUTINGFLAG = '0' ) 
                             AND GROUTINGDAILYDETAILID = {groutingDailyDetailId}
                         ";
                     result = Convert.ToInt32(conn.GetSqlResultToStr(sqlStr));
@@ -1862,7 +1861,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                     else
                     {
                         sre.Status = Constant.ServiceResultStatus.ValidationFailed;
-                        sre.Message = "产品已在产或报损撤销重复操作！";
+                        sre.Message = "未注浆/在产/报损/的产品不能操作！";
                     }
                 }
                 //更新条码使用表