商品对接逻辑优化

src/custom/service/AutoDockItemService.java

@@ -37,7 +37,7 @@ public class AutoDockItemService extends ServiceController {
 
             ArrayList<String> sqlList = new ArrayList<>();
             Rows itemRows = dbConnect.runSqlQuery("SELECT itemid,itemno from  plm_item WHERE siteid = '" + siteid + "' AND status = '新建' ");
-            Rows itemRowsAll = dbConnect.runSqlQuery("SELECT itemid,itemno,status from  plm_item WHERE siteid = '" + siteid + "'");
+            Rows itemRowsAll = dbConnect.runSqlQuery("SELECT itemid,itemno,status,isonsale,sa_customschemeid from  plm_item WHERE siteid = '" + siteid + "'");
             //单位
             Rows unitRows = dbConnect.runSqlQuery("SELECT unitid,unitname from  plm_unit WHERE siteid = '" + siteid + "'");
             RowsMap unitRowsMap = unitRows.toRowsMap("unitname");
@@ -174,9 +174,9 @@ public class AutoDockItemService extends ServiceController {
                         String cheek = jsonObject.getStringValue("fsizedescription");//工艺
                         String material = jsonObject.getStringValue("fmaterialdes");//选项
                         String color = jsonObject.getStringValue("fcolor");//颜色
-                        boolean isonsale = true;
+                        boolean isonsale = itemRowsMapAll.get(jsonObject.getString("fitemno")).get(0).getBoolean("isonsale");
                         if (dbConnect.runSqlQuery("SELECT 1 FROM plm_item t1 LEFT JOIN plm_itemextend t2 ON t2.itemid=t1.itemid AND t2.siteid=t1.siteid " +
-                                "WHERE spec='" + spec + "' AND cheek='" + cheek + "' AND material='" + material + "' AND color='" + color + "'").isEmpty()) {
+                                "WHERE spec='" + spec + "' AND cheek='" + cheek + "' AND material='" + material + "' AND color='" + color + "'").isEmpty() && itemRowsMapAll.get(jsonObject.getString("fitemno")).get(0).getLong("sa_customschemeid")!=0) {
                             isonsale = false;
                             sqlList.add("delete from sa_itemgroupmx WHERE itemid=" + itemid + " and siteid='" + siteid + "' ");
                             Rows rows = dbConnect.runSqlQuery("SELECT sa_itemgroupid from sa_itemgroupmx WHERE itemid=" + itemid + " and siteid='" + siteid + "' ");