Merge branch 'master' of http://git.dongkesoft.com:9001/hg5010/dk.hg5010.wcf

DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -7621,6 +7621,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 "    ,rreason\n" +
                 "    ,remarks\n" +
                 "    ,auditstatus\n" +
+                "    ,auditor\n" +
+                "    ,auditdate\n" +
                 "    ,accountid\n" +
                 "    ,createuserid\n" +
                 "    ,updateuserid\n" +
@@ -7663,6 +7665,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 "          ,:rreason\n" +
                 "          ,:remarks\n" +
                 "          ,1\n" +
+                "          ,:auditor\n" +
+                "          ,:auditdate\n" +
                 "          ,:accountid\n" +
                 "          ,:userid\n" +
                 "          ,:userid\n" +
@@ -7825,7 +7829,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                         new OracleParameter(":remarks",cre.Properties["remarks"]),
                         new OracleParameter(":accountid",userInfo.AccountID),
                         new OracleParameter(":userid",userInfo.UserID),
-                        new OracleParameter(":barcode", barcode)
+                        new OracleParameter(":barcode", barcode),
+                        new OracleParameter(":auditor", userInfo.UserID),
+                        new OracleParameter(":auditdate", DateTime.Now.Date)
                     };
                     sre.OtherStatus += oracleTrConn.ExecuteNonQuery(insertScrapproduct, oracleParameter);