拆减产品调整

DK.Service/PDAModuleLogic/PDAModuleLogicEntrucking.cs

@@ -718,6 +718,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 						int execute = conn.ExecuteNonQuery(sqlStr);
 						if (execute > 0)
 						{
+							conn.Commit();
 							sre.Status = Constant.ServiceResultStatus.Success;
 							sre.Message = "操作成功！";
 						}
@@ -752,7 +753,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 		/// <param name="barCode"></param>
 		/// <param name="sUser"></param>
 		/// <returns></returns>
-		public static ServiceResultEntity CheckTruckBarCodeForUnbind(string barCode, SUserInfo sUser)
+		public static ServiceResultEntity CheckTruckBarCodeForUnbind(string barCode, string entruckingCode,SUserInfo sUser)
 		{
 			ServiceResultEntity sre = new ServiceResultEntity();
 			sre.Data = new DataSet();
@@ -783,7 +784,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                             AND TPE.Batch = TPED.Batch
                             WHERE TPE.Status = 1
 							AND (TPED.DOFUNCTION = '1' OR TPED.DOFUNCTION = '3')
-                            AND TPED.BARCODE = '{barCode}'";
+                            AND TPED.BARCODE = '{barCode}'
+                            AND TPED.ENTRUCKINGCODE = '{entruckingCode}'";
 						dt = conn.GetSqlResultToDt(sqlStr);
 						if (dt.Rows.Count > 0)
 						{