立库接口 成品库出

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1377,7 +1377,6 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 										FROM
 											TP_PM_ENTRUCKINGDETAIL TPED
 										INNER JOIN TP_PM_ENTRUCKING TPE ON TPED.ENTRUCKINGCODE = TPE.ENTRUCKINGCODE 
-											AND TPED.BATCH = TPE.BATCH 
 										LEFT JOIN TP_PC_PROCEDURE TPP ON TPED.ProcedureID = TPP.ProcedureID
 										WHERE
 											1 = 1 

WCF.Service/WCF.Ex_HGS3_QRS/Ex_HGS3_QR.cs

@@ -351,6 +351,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                 barcodeTable.Columns.Add("UserCode");
                 barcodeTable.Columns.Add("UserName");
                 barcodeTable.Columns.Add("GroutingUserCode");
+                barcodeTable.Columns.Add("out_errMsg");
 
                 //初始化用户信息
                 SUserInfo sUserInfo = new SUserInfo();
@@ -377,13 +378,16 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                         {
                             continue;
                         }
-                        //验证不通过的不调用 xuwei add 2022-04-13
-                        string[] temp = new string[1];
-                        temp[0] = barCodes[i];
-                        string msg = checkBarcode(procedureID, temp);
+						//验证不通过的不调用 xuwei add 2022-04-13
+						string[] temp = new string[1];
+						temp[0] = barCodes[i];
+						string msg = checkBarcode(procedureID, temp);
                         if (msg != "")
                         {
-                            continue;
+                            DataRow drw = barcodeTable.NewRow();
+                            drw["out_errMsg"] = msg;
+                            barcodeTable.Rows.Add(drw);
+                            return barcodeTable;
                         }
                         //重复条码不要加进去，处在首节点会报错
                         barcodeTable.PrimaryKey = new DataColumn[] { barcodeTable.Columns["BarCode"] };
@@ -402,7 +406,7 @@ namespace Dongke.IBOSS.PRD.WCF.ExHGS3QRS
                         //fly add 2022-05-10 交坯节点必须有这个参数
                         dr["GroutingUserCode"] = conn.ExecuteScalar(@"
                                 SELECT
-	                                P.USERCODE 
+	                                P.USERCODE
                                 FROM
 	                                TP_PM_GROUTINGDAILYDETAIL P 
                                 WHERE