发货计划生成销售出库单逻辑优化及bug修复

src/custom/restcontroller/sale/shoppingcart/ShoppingCart.java

@@ -291,7 +291,7 @@ public class ShoppingCart extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_brand", "t2", "t2.sa_brandid = t1.sa_brandid AND t2.siteid = t1.siteid","brandname");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid = t1.itemid AND t3.siteid = t1.siteid","itemname","model","spec"
                 ,"orderminqty","orderaddqty","orderminqty_auxunit","orderaddqty_auxunit","iscustomsize","pricingmetod","widthschemeid","lengthschemeid","materialschemeid"
-                ,"colorschemeid","cheekschemeid","sa_customschemeid");
+                ,"colorschemeid","cheekschemeid","sa_customschemeid","custamount");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t4", "t4.unitid = t3.unitid AND t4.siteid = t1.siteid","unitname");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unitgroup", "t5", "t5.unitgroupid = t3.unitgroupid AND t5.siteid = t1.siteid","unitgroupname");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t6.unitid = t5.auxunitid AND t5.siteid = t1.siteid");

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

@@ -413,7 +413,7 @@ public class itemclass extends Controller {
         Long itemclassid = content.getLong("itemclassid");
 
         Rows rowscount = dbConnect.runSqlQuery(
-                "select isdeep,ifnull(parentid,0) parentid,itemclassnum from plm_itemclass where itemclassid=" + itemclassid);
+                "select isdeep,ifnull(parentid,0) parentid,itemclassnum,classtype from plm_itemclass where itemclassid=" + itemclassid);
         if (rowscount.isEmpty()) {
             return getErrReturnObject().setErrMsg("此营销类别不存在，无法删除").toString();
         } else {

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -194,6 +194,7 @@ public class sendplandetail extends Controller {
                 String key = (String) entry2.getKey();
                 List<JSONObject> paolist = (List<JSONObject>) entry2
                         .getValue();
+                Iterator<JSONObject> senddetailpaoit1 = paolist.iterator();
                 Iterator<JSONObject> senddetailpaoit = paolist.iterator();
                 SQLFactory sqlFactory = new SQLFactory(this, "销售出库单新增");
                 long st_stockbillid = createTableID("st_stockbill");
@@ -204,7 +205,7 @@ public class sendplandetail extends Controller {
                 sqlFactory.addParameter("type", "销售出库");
                 sqlFactory.addParameter("rb", 1);
                 sqlFactory.addParameter("departmentid", departmentid);
-                JSONObject firstItem = senddetailpaoit.hasNext() ? senddetailpaoit.next() : null;
+                JSONObject firstItem = senddetailpaoit1.hasNext() ? senddetailpaoit1.next() : null;
                 if (firstItem != null) {
                     sqlFactory.addParameter("outplace", firstItem.getStringValue("outplace"));
                     sqlFactory.addParameter("rec_contactsid", firstItem.getStringValue("rec_contactsid"));