退料

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -2712,15 +2712,15 @@ a.ExtensionID
                                 BEGIN
                                 " + sqlNew + @"
                                 END";
-                                sql = @"IF EXISTS(SELECT log.LotNo FROM ICSWareHouseLotInfoLog log
-                                        INNER JOIN ICSWareHouseLotInfo a ON a.LotNo=log.LotNo AND a.WorkPoint=log.WorkPoint
-                                        WHERE a.LotNo='{2}' AND a.WorkPoint='{3}' AND a.EATTRIBUTE1<>'1' AND log.BusinessCode='" + type + @"'
-                                        GROUP BY log.LotNo HAVING COUNT(log.LotNo)>=2)
-                                BEGIN
-	                                RAISERROR('" + string.Format(language.GetNameByCode(msglanguage), "{2}") + @"',16,1);
-                                    RETURN
-                                END
-                                " + sql;
+                                //sql = @"IF EXISTS(SELECT log.LotNo FROM ICSWareHouseLotInfoLog log
+                                //        INNER JOIN ICSWareHouseLotInfo a ON a.LotNo=log.LotNo AND a.WorkPoint=log.WorkPoint
+                                //        WHERE a.LotNo='{2}' AND a.WorkPoint='{3}' AND a.EATTRIBUTE1<>'1' AND log.BusinessCode='" + type + @"'
+                                //        GROUP BY log.LotNo HAVING COUNT(log.LotNo)>=2)
+                                //BEGIN
+	                               // RAISERROR('" + string.Format(language.GetNameByCode(msglanguage), "{2}") + @"',16,1);
+                                //    RETURN
+                                //END
+                                //" + sql;
 
                                 columns = @"SUM(log.Quantity) AS Quantity,a.quantity as InfoQuantity,
                                     SUM(log.Quantity*(lot.Amount/lot.Quantity)) AS Amount,log.FromWarehouseCode,log.FromLocationCode,