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

DK.Service/SmartDeviceService/SmartDeviceLogic.cs

@@ -247,7 +247,7 @@ namespace Dongke.IBOSS.PRD.Service.SmartDeviceService
                     "  FROM tp_pm_groutingdailydetail t\n" +
                     " INNER JOIN tp_mst_goods g\n" +
                     "    ON g.goodsid = t.goodsid\n" +
-                    " WHERE t.barcode = :barcode";
+                    " WHERE t.barcode = @barcode@";
                 DataTable data = access.ExecuteDatatable(sqlString, new CDAParameter("barcode", barcode));
 
                 return data;

WCF.Service/WCF.Ex_HGS3_QRS/Ex_HGS3_QR.cs

@@ -105,28 +105,28 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     switch (road_no)
                     {
                         case 1:
-                            sUserInfo.UserID = 1;
-                            sUserInfo.UserCode = "SC35_1";
+                            sUserInfo.UserID = 717;
+                            sUserInfo.UserCode = "XZB";
                             break;
                         case 2:
-                            sUserInfo.UserID = 2;
-                            sUserInfo.UserCode = "SC35_2";
+                            sUserInfo.UserID = 717;
+                            sUserInfo.UserCode = "XZB";
                             break;
                         case 3:
-                            sUserInfo.UserID = 3;
-                            sUserInfo.UserCode = "SC35_3";
+                            sUserInfo.UserID = 717;
+                            sUserInfo.UserCode = "XZB";
                             break;
                         case 4:
-                            sUserInfo.UserID = 4;
-                            sUserInfo.UserCode = "SC35_4";
+                            sUserInfo.UserID = 717;
+                            sUserInfo.UserCode = "XZB";
                             break;
                         case 5:
-                            sUserInfo.UserID = 5;
-                            sUserInfo.UserCode = "SC35_5";
+                            sUserInfo.UserID = 717;
+                            sUserInfo.UserCode = "XZB";
                             break;
                         case 6:
-                            sUserInfo.UserID = 6;
-                            sUserInfo.UserCode = "SC35_6";
+                            sUserInfo.UserID = 717;
+                            sUserInfo.UserCode = "XZB";
                             break;
                         default:
                             returnMessage = $"NG:工序[3_5_1]预干区（入）不存在道口号[{road_no}]";
@@ -138,8 +138,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 阴干区（入）
                     // TODO
                     procedureID = 83; //xuwei 2020-07-04 modify
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
 
                 }
                 else if (procedure_no == "3_4_2")
@@ -147,8 +147,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 烘干区（入）
                     // TODO
                     procedureID = 86; //xuwei 2020-07-04 modify
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
 
                 }
                 else if (procedure_no == "3_4_3")
@@ -156,8 +156,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 烘干区（出）
                     // TODO
                     procedureID = 87; //xuwei 2020-07-04 modify
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
 
                 }
                 else if (procedure_no == "3_3_1")
@@ -165,8 +165,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 毛坯库（入）
                     // TODO
                     procedureID = 91; //xuwei 2020-07-04 modify
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
                     if (road_no == 2)
                     {
 
@@ -178,8 +178,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 毛坯库（出）
                     // TODO
                     procedureID = 92; //xuwei 2020-07-04 modify
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
 
                 }
                 else if (procedure_no == "3_3_3")
@@ -187,8 +187,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 精坯库（入）
                     // TODO
                     procedureID = 97; //xuwei 2020-07-04 modify
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
 
                 }
                 else if (procedure_no == "3_2_1")
@@ -196,8 +196,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 釉坯库（入）
                     // TODO
                     procedureID = 100; //xuwei 2020-07-04 modify
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
 
                 }
                 else if (procedure_no == "3_1_1")
@@ -205,8 +205,8 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     // 光瓷库（入）
                     // TODO
                     procedureID = 106; //xuwei 2020-07-04 modify 成瓷库
-                    sUserInfo.UserID = 4;
-                    sUserInfo.UserCode = "SC35_4";
+                    sUserInfo.UserID = 717;
+                    sUserInfo.UserCode = "XZB";
 
                 }
 
@@ -216,9 +216,17 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                     barcodeTable.Columns.Add("LogoID");
                     barcodeTable.Columns.Add("BarCode");
                     barcodeTable.Columns.Add("Remarks");
+                    barcodeTable.Columns.Add("UserID");
+                    barcodeTable.Columns.Add("UserCode");
+                    barcodeTable.Columns.Add("UserName");
+                    DataRow dr = barcodeTable.NewRow();
+                    dr["BarCode"] = barcode;
+                    dr["UserID"] = 7;
+                    dr["UserCode"] = "XZB";
+                    dr["UserName"] = "谢大师";
 
-                    barcodeTable.Rows[0]["BarCode"] = barcode;
-                    barcodeTable.Rows[0]["Remarks"] = (weight > 0 ? weight+"KG" : null);
+                    barcodeTable.Rows.Add(dr);
+                    //barcodeTable.Rows[0]["Remarks"] = (weight > 0 ? weight+"KG" : null);
 
                     ProcedureEntity procedureInfo = null;
                     DataTable dt = PMModuleLogicDAL.AddWorkPiece(procedureID, barcodeTable, sUserInfo, out procedureInfo);