调拨单反审核优化

src/custom/restcontroller/webmanage/sale/dbstockbill/dbstockbill.java

@@ -399,10 +399,13 @@ public class dbstockbill extends Controller {
             if(!dbstockbilldetailrowsMap.containsKey(row.getString("st_dbstockbilldetailid"))){
                 return getErrReturnObject().setErrMsg("关联表体不存在").toString();
             }
-            if(dbstockbilldetailrowsMap.get(row.getString("st_dbstockbilldetailid")).get(0).getLong("instockid")
+            if(!dbstockbillrows.get(0).getBoolean("isnotimmediately") && dbstockbilldetailrowsMap.get(row.getString("st_dbstockbilldetailid")).get(0).getLong("instockid")
                     !=skurowsmap.get(row.getString("sku")).get(0).getLong("stockid")){
                 return getErrReturnObject().setErrMsg("序列号" + row.getString("sku")+ "所在仓库已变动").toString();
             }
+            if(dbstockbillrows.get(0).getBoolean("isnotimmediately") && 0!=skurowsmap.get(row.getString("sku")).get(0).getLong("stockid")){
+                return getErrReturnObject().setErrMsg("序列号" + row.getString("sku")+ "所在仓库已变动").toString();
+            }
         }
 
         Rows stockbill=dbConnect.runSqlQuery("select * from st_stockbill where sourceid="+st_dbstockbillid +" and sourceobject='st_dbstockbill' and siteid='"+siteid+"'");