中陶，不交坯，可以回收

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -21697,11 +21697,11 @@ updateuserid=:updateuserid where barcode=:barcode";
                 }
                 else
                 {
-                    if (Convert.ToInt32(ds.Tables[0].Rows[0]["DeliverFlag"]) != 1)
-                    {
-                        errorMessage = "条码[" + barcode + "]未交坯，不能回收";
-                    }
-                    else
+                    //if (Convert.ToInt32(ds.Tables[0].Rows[0]["DeliverFlag"]) != 1)
+                    //{
+                    //    errorMessage = "条码[" + barcode + "]未交坯，不能回收";
+                    //}
+                    //else
                     {
                         goodsID = Convert.ToInt32(ds.Tables[0].Rows[0]["GoodsID"]);
                         goodsName = ds.Tables[0].Rows[0]["goodsName"].ToString();

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -4921,12 +4921,12 @@ and (TP_PM_ProductionDataIn.modeltype <> 5 or (exists (select 1 from tp_pm_grout
 					}
 					else
 					{
-						if (Convert.ToInt32(ds.Tables[0].Rows[0]["DeliverFlag"]) != 1)
-						{
-							dr[Constant.BarCodeResultTableColumns.out_errMsg.ToString()] = "条码[" + barcode + "]未交坯，不能回收";
-							isError = true;
-						}
-						else
+						//if (Convert.ToInt32(ds.Tables[0].Rows[0]["DeliverFlag"]) != 1)
+						//{
+						//	dr[Constant.BarCodeResultTableColumns.out_errMsg.ToString()] = "条码[" + barcode + "]未交坯，不能回收";
+						//	isError = true;
+						//}
+						//else
 						{
 							goodsID = Convert.ToInt32(ds.Tables[0].Rows[0]["GoodsID"]);
 							goodsName = ds.Tables[0].Rows[0]["goodsName"].ToString();