bug修复

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -72,7 +72,7 @@ public class OrderItems extends Controller {
         //查询erp库存
 //        Invbal.selectErpInvbal(this, items);
 
-        Rows itemRows = dbConnect.runSqlQuery("select t1.*,t2.material from plm_item t1 left join plm_itemextend t2 ON t2.itemid = t1.itemid AND t2.siteid = t1.siteid where t1.siteid='" + siteid + "'");
+        Rows itemRows = dbConnect.runSqlQuery("select t1.*,t2.material from plm_item t1 left join plm_itemextend t2 ON t2.itemid = t1.itemid AND t2.siteid = t1.siteid where t1.siteid='" + siteid + "' ");
         RowsMap itemRowsMap = itemRows.toRowsMap("itemid");
         BigDecimal sumqty = BigDecimal.ZERO;
         for (Object obj : items) {
@@ -121,51 +121,52 @@ public class OrderItems extends Controller {
             JSONArray customproperties=new JSONArray();
             if (sa_orderitemsid <= 0) {
                 Rows rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and itemid=" + itemid + " and sa_orderid=" + sa_orderid);
-                if (rows.isEmpty()) {
-                    sa_orderitemsid = createTableID("sa_orderitems");
-                } else {
-                    System.out.println(beans.order.Order.getDefaultIsRepeatValue(siteid, type));
-                    if (beans.order.Order.getDefaultIsRepeatValue(siteid, type)) {
-                        sa_orderitemsid = createTableID("sa_orderitems");
-                        sqlFactory = new SQLFactory(this, "订单商品明细_新增");
-                        Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
-                        RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
 
-                        if (itemRowsMap.containsKey(item.getString("itemid"))) {
-                            if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
-                                if(itemRowsMap.get(item.getString("itemid")).get(0).getLong("sa_customschemeid")>0 && !itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
-                                    System.out.println(0000);
-                                    if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
-                                         System.out.println(111111);
-                                        for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
-                                            System.out.println(customschemeItem.getString("description"));
-                                            System.out.println(2222);
-                                            customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
-                                        }
-                                    }
-                                } else if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
-                                    System.out.println(3333);
-                                    if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
-                                        System.out.println(4444);
-                                        for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
-                                            System.out.println(5555);
-                                             System.out.println((customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))).size());
-                                            if(!customschemeItem.getString("value").equals("spec")){
-                                                customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
-                                            }else{
-                                                customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
-                                            }
-
-                                        }
+                Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
+                RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
+
+                if (itemRowsMap.containsKey(item.getString("itemid"))) {
+                    if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
+                        if(itemRowsMap.get(item.getString("itemid")).get(0).getLong("sa_customschemeid")>0 && !itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
+                            System.out.println(0000);
+                            if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
+                                System.out.println(111111);
+                                for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
+                                    System.out.println(customschemeItem.getString("description"));
+                                    System.out.println(2222);
+                                    customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
+                                }
+                            }
+                        } else if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
+                            System.out.println(3333);
+                            if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
+                                System.out.println(4444);
+                                for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
+                                    System.out.println(5555);
+                                    System.out.println((customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))).size());
+                                    if(!customschemeItem.getString("value").equals("spec")){
+                                        customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
                                     }else{
                                         customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
                                     }
-                                }
 
+                                }
+                            }else{
+                                customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
                             }
-
                         }
 
+                    }
+
+                }
+
+                if (rows.isEmpty()) {
+                    sa_orderitemsid = createTableID("sa_orderitems");
+                } else {
+                    System.out.println(beans.order.Order.getDefaultIsRepeatValue(siteid, type));
+                    if (beans.order.Order.getDefaultIsRepeatValue(siteid, type)) {
+                        sa_orderitemsid = createTableID("sa_orderitems");
+                        sqlFactory = new SQLFactory(this, "订单商品明细_新增");
                     } else {
                         price1 = rows.get(0).getBigDecimal("price");
                         sa_orderitemsid = rows.get(0).getLong("sa_orderitemsid");