u8产品入库新增序列号是否已在仓库中判断

src/custom/service/GetStockBillFromU8.java

@@ -89,12 +89,12 @@ public class GetStockBillFromU8 extends ServiceController {
 
                     }
                     Rows u8billmxCodeRows = u8billmxCodeRowsMap.get(id);
-                    ArrayList<String> skuArrayList = SQLFactory.createQuerySQL(dbConnect, "sa_itemsku", "sku").setWhere("sku", u8billmxCodeRows.toArrayList("cinvsn")).query().toArrayList("sku");
+                    ArrayList<String> skuArrayList = SQLFactory.createQuerySQL(dbConnect, "sa_itemsku", "sku").setWhere("sku", u8billmxCodeRows.toArrayList("cinvsn")).setWhere("ifnull(stockid,0)=0").query().toArrayList("sku");
                     for (Row codeRow : u8billmxCodeRows) {
                         String cinvsn = codeRow.getString("cinvsn");
                         if (!skuArrayList.contains(cinvsn)) {
-                            YUNl_DB.runSqlUpdate("update RdRecord set ErrTimes=isnull(ErrTimes,0)+1,failreason='序列号不存在' where ID =" + id + " and billtype='10' ");
-                            logger.info("入库单{}序列号{}不存在", ccode, cinvsn);
+                            YUNl_DB.runSqlUpdate("update RdRecord set ErrTimes=isnull(ErrTimes,0)+1,failreason='序列号不存在，或所在仓库不为空' where ID =" + id + " and billtype='10' ");
+                            logger.info("入库单{}序列号{}不存在，或所在仓库不为空", ccode, cinvsn);
                             continue foreachbill;
                         }
                     }