新增厚度定制方案字段

src/custom/restcontroller/sale/item/SQL/查询商品列表.sql

@@ -19,6 +19,7 @@ SELECT t1.itemid,
        t1.delistingstatus,
        t1.iscustomsize,
        t1.widthschemeid,
+       t1.heightschemeid,
        t1.lengthschemeid,
        t1.sa_customschemeid,
        t8.caliber,

src/custom/restcontroller/sale/promotion/SQL/促销方案商品查询(区域经理).sql

@@ -12,6 +12,7 @@ SELECT
 	t1.signaturecode,
 	t2.iscustomsize,
     t2.widthschemeid,
+    t2.heightschemeid,
     t2.lengthschemeid,
     t2.sa_customschemeid,
     t2.materialschemeid,

src/custom/restcontroller/sale/promotion/SQL/促销方案商品查询.sql

@@ -12,6 +12,7 @@ SELECT
 	t1.signaturecode,
 	t2.iscustomsize,
     t2.widthschemeid,
+    t2.heightschemeid,
     t2.lengthschemeid,
     t2.sa_customschemeid,
     t2.materialschemeid,

src/custom/restcontroller/sale/shoppingcart/SQL/购物车列表.sql

@@ -22,6 +22,7 @@ SELECT t1.sa_shoppingcartid,
        t3.iscustomsize,
        t3.pricingmetod,
        t3.widthschemeid,
+       t3.heightschemeid,
        t3.lengthschemeid,
        t4.unitname,
        t5.unitgroupname,

src/custom/restcontroller/webmanage/lsak3/item/SQL/货品档案新增.sql

@@ -2,9 +2,9 @@ insert into plm_item (siteid, itemid, createby, createdate, changeuserid, change
                       isauxunit, unitgroupid, itemname, isonsale, status, model, spec, orderminqty, orderaddqty,
                       orderminqty_auxunit, orderaddqty_auxunit, remarks, barcode, skucontrol, batchcontrol, grossweight,
                       weight, height, width, length, delivery, istool, marketprice, standards, stockstatus2,
-                      stockstatus1, warrantyday, iswuliao, isservice,color,packageqty,ismodule,iswoodproducts,sa_customschemeid,cheek,delistingstatus,financeclasstype,stockno,volume,marketingcategory,k3outcode,widthschemeid,lengthschemeid,description,pricingmetod)
+                      stockstatus1, warrantyday, iswuliao, isservice,color,packageqty,ismodule,iswoodproducts,sa_customschemeid,cheek,delistingstatus,financeclasstype,stockno,volume,marketingcategory,k3outcode,widthschemeid,heightschemeid,lengthschemeid,description,pricingmetod)
 values ($siteid$, $itemid$, $username$, CURRENT_TIME, $userid$, $username$, CURRENT_TIME, $itemno$, $unitid$,
         $isauxunit$, $unitgroupid$, $itemname$, 0, '新建', $model$, $spec$, $orderminqty$, $orderaddqty$,
         $orderminqty_auxunit$, $orderaddqty_auxunit$, $remarks$, $barcode$, $skucontrol$, $batchcontrol$, $grossweight$,
         $weight$, $height$, $width$, $length$, $delivery$, $istool$, $marketprice$, $standards$,
-        $stockstatus2$, $stockstatus1$, $warrantyday$, $iswuliao$, $isservice$,$color$,$packageqty$,$ismodule$,$iswoodproducts$,$sa_customschemeid$,$cheek$,$delistingstatus$,$financeclasstype$,$stockno$,$volume$,$marketingcategory$,$k3outcode$,$widthschemeid$,$lengthschemeid$,$description$,$pricingmetod$)
+        $stockstatus2$, $stockstatus1$, $warrantyday$, $iswuliao$, $isservice$,$color$,$packageqty$,$ismodule$,$iswoodproducts$,$sa_customschemeid$,$cheek$,$delistingstatus$,$financeclasstype$,$stockno$,$volume$,$marketingcategory$,$k3outcode$,$widthschemeid$,$heightschemeid$,$lengthschemeid$,$description$,$pricingmetod$)

src/custom/restcontroller/webmanage/lsak3/item/SQL/货品档案更新.sql

@@ -43,6 +43,7 @@ SET changeuserid=$userid$,
     stockno=$stockno$,
     volume=$volume$,
     widthschemeid=$widthschemeid$,
+    heightschemeid=$heightschemeid$,
     lengthschemeid=$lengthschemeid$,
     iscustomsize=$iscustomsize$,
     customprice=$customprice$,

src/custom/restcontroller/webmanage/lsak3/item/item.java

@@ -154,7 +154,7 @@ public class item extends Controller {
                 long itemid = itemRows.get(0).getLong("itemid");
                 sqlFactory = new SQLFactory(this,"货品档案更新");
                 sqlFactory.addParameter("itemid",itemid);
-                Rows customitemRows = dbConnect.runSqlQuery("select widthschemeid,lengthschemeid,spec,color,material,cheek,t1.status,t1.isonsale,t1.sa_customschemeid from plm_item t1 left join plm_itemextend t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.itemid="+itemid);
+                Rows customitemRows = dbConnect.runSqlQuery("select widthschemeid,heightschemeid,lengthschemeid,spec,color,material,cheek,t1.status,t1.isonsale,t1.sa_customschemeid from plm_item t1 left join plm_itemextend t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.itemid="+itemid);
                 if(!customitemRows.isEmpty()){
                     if(customitemRows.get(0).getString("spec").equals(flong) && customitemRows.get(0).getString("color").equals(fcolour)
                             && customitemRows.get(0).getString("material").equals(fbx) && customitemRows.get(0).getString("cheek").equals(fbk)){
@@ -310,9 +310,11 @@ public class item extends Controller {
                 if(!itemRows.isEmpty()){
                     sqlFactory.addParameter("widthschemeid",itemRows.get(0).getLong("widthschemeid"));
                     sqlFactory.addParameter("lengthschemeid", itemRows.get(0).getLong("lengthschemeid"));
+                    sqlFactory.addParameter("heightschemeid",itemRows.get(0).getLong("heightschemeid"));
                 }else{
                     sqlFactory.addParameter("widthschemeid",1);
                     sqlFactory.addParameter("lengthschemeid", 1);
+                    sqlFactory.addParameter("heightschemeid",1);
                 }
                 if(fitemname.contains("内开隐形门")){
                     sqlFactory.addParameter("pricingmetod", 2);
@@ -324,6 +326,7 @@ public class item extends Controller {
             }else{
                 sqlFactory.addParameter("widthschemeid",0);
                 sqlFactory.addParameter("lengthschemeid", 0);
+                sqlFactory.addParameter("heightschemeid",0);
                 sqlFactory.addParameter("pricingmetod", 2);
 
             }

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -184,6 +184,7 @@ public class Item extends Controller {
         sqlFactory.addParameter("iscustomsize", content.getBooleanValue("iscustomsize"));
         sqlFactory.addParameter("customprice", content.getBigDecimalValue("customprice"));
         sqlFactory.addParameter("widthschemeid", content.getBigDecimalValue("widthschemeid"));
+        sqlFactory.addParameter("heightschemeid", content.getBigDecimalValue("heightschemeid"));
         sqlFactory.addParameter("lengthschemeid", content.getBigDecimalValue("lengthschemeid"));
         Long pricingmetod = content.getLongValue("pricingmetod");
         sqlFactory.addParameter("pricingmetod", pricingmetod == 0 ? 1 : pricingmetod);
@@ -595,6 +596,8 @@ public class Item extends Controller {
         querySQL.addQueryFields("widthschemename", "t4.schemename ");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sizecustomizedscheme", "t5", "t1.lengthschemeid=t5.sa_sizecustomizedschemeid and t1.siteid=t5.siteid");
         querySQL.addQueryFields("lengthschemename", "t5.schemename ");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sizecustomizedscheme", "t16", "t1.heightschemeid=t16.sa_sizecustomizedschemeid and t1.siteid=t16.siteid");
+        querySQL.addQueryFields("heightschemename", "t5.schemename ");
 
         querySQL.addJoinTable(JOINTYPE.left, "sa_itemprice", "t9", "t9.itemid = t1.itemid AND t9.siteid = t1.siteid and t9.pricegrade=1");
         querySQL.addQueryFields("price1", "t9.price ");

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案列表.sql

@@ -33,6 +33,7 @@ SELECT t1.itemid,
        t1.delistingstatus,
        t1.stockno,
        t1.widthschemeid,
+       t1.heightschemeid,
        t1.lengthschemeid,
        t1.iscustomsize,
        t1.customprice,
@@ -64,6 +65,7 @@ SELECT t1.itemid,
        t8.device,
        t4.schemename widthschemename,
        t5.schemename lengthschemename,
+       t15.schemename heightschemename,
        t9.price price1,
        t10.price price2,
        t11.price price3,
@@ -76,6 +78,7 @@ FROM plm_item t1
          LEFT JOIN plm_itemextend t8 ON t8.itemid = t1.itemid AND t8.siteid = t1.siteid
          left join sa_sizecustomizedscheme t4 on t1.widthschemeid=t4.sa_sizecustomizedschemeid and t1.siteid=t4.siteid
          left join sa_sizecustomizedscheme t5 on t1.lengthschemeid=t5.sa_sizecustomizedschemeid and t1.siteid=t5.siteid
+         left join sa_sizecustomizedscheme t15 on t1.heightschemeid=t15.sa_sizecustomizedschemeid and t1.siteid=t15.siteid
          left join sa_itemprice t9 on t9.itemid = t1.itemid AND t9.siteid = t1.siteid and t9.pricegrade=1
          left join sa_itemprice t10 on t10.itemid = t1.itemid AND t10.siteid = t1.siteid and t10.pricegrade=2
          left join sa_itemprice t11 on t11.itemid = t1.itemid AND t11.siteid = t1.siteid and t11.pricegrade=3

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -41,6 +41,7 @@ SET changeuserid=$userid$,
     marketingcategory=$marketingcategory$,
     volume=$volume$,
     widthschemeid=$widthschemeid$,
+    heightschemeid=$heightschemeid$,
     lengthschemeid=$lengthschemeid$,
     iscustomsize=$iscustomsize$,
     customprice=$customprice$,

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案详情.sql

@@ -23,6 +23,7 @@ SELECT t1.*,
        ifnull(t3.qty, 0)   invbal_qty,
        t4.schemename widthschemename,
        t5.schemename lengthschemename,
+       t15.schemename heightschemename,
        t6.schemename,
        ifnull(t9.price,0) price1,
        ifnull(t10.price,0) price2,
@@ -35,6 +36,8 @@ FROM plm_item t1
          LEFT JOIN st_invbal_sale t3 ON t3.siteid = t1.siteid AND t3.itemid = t1.itemid
          left join sa_sizecustomizedscheme t4 on t1.widthschemeid=t4.sa_sizecustomizedschemeid and t1.siteid=t4.siteid
          left join sa_sizecustomizedscheme t5 on t1.lengthschemeid=t5.sa_sizecustomizedschemeid and t1.siteid=t5.siteid
+         left join sa_sizecustomizedscheme t15 on t1.heightschemeid=t15.sa_sizecustomizedschemeid and t1.siteid=t15.siteid
+
          left join sa_customscheme t6 on t1.sa_customschemeid=t6.sa_customschemeid and t1.siteid=t6.siteid
          left join sa_itemprice t9 on t9.itemid = t1.itemid AND t9.siteid = t1.siteid and t9.pricegrade=1
          left join sa_itemprice t10 on t10.itemid = t1.itemid AND t10.siteid = t1.siteid and t10.pricegrade=2

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

@@ -94,6 +94,10 @@ public class OrderFeeCostPlan extends Controller {
         querySQL.addQueryFields("widthschemename", "t4.schemename ");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sizecustomizedscheme", "t5", "t1.lengthschemeid=t5.sa_sizecustomizedschemeid and t1.siteid=t5.siteid");
         querySQL.addQueryFields("lengthschemename", "t5.schemename ");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sizecustomizedscheme", "t17", "t1.heightschemeid=t17.sa_sizecustomizedschemeid and t1.siteid=t17.siteid");
+        querySQL.addQueryFields("heightschemename", "t17.schemename ");
+
+
 
         querySQL.addJoinTable(JOINTYPE.left, "sa_itemprice", "t9", "t9.itemid = t1.itemid AND t9.siteid = t1.siteid and t9.pricegrade=1");
         querySQL.addQueryFields("price1", "t9.price ");

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

@@ -643,7 +643,7 @@ public class OrderItems extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems");
         querySQL.addJoinTable(JOINTYPE.left, "st_invbal_sale", "t2", "t2.siteid = t1.siteid AND t2.itemid = t1.itemid");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t3", "t3.itemid = t1.itemid and t3.siteid = t1.siteid",
-                "orderminqty_auxunit", "orderaddqty_auxunit", "spec", "iscustomsize", "widthschemeid", "lengthschemeid", "standards", "k3outcode");
+                "orderminqty_auxunit", "orderaddqty_auxunit", "spec", "iscustomsize", "widthschemeid","heightschemeid", "lengthschemeid", "standards", "k3outcode");
 //        querySQL.addJoinTable(JOINTYPE.left, "plm_itemextend", "t4", "t4.itemid = t1.itemid and t4.siteid = t1.siteid",
 //                "erpitemno", "erpitemname", "material", "prodline", "device", "specalnote");
         querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_items", "t4",

src/custom/restcontroller/webmanage/sale/order/SQL/促销方案商品列表.sql

@@ -6,6 +6,7 @@ SELECT t1.itemid,
        t1.orderminqty_auxunit,
        t1.iscustomsize,
        t1.widthschemeid,
+       t1.heightschemeid,
        t1.lengthschemeid,
        t1.sa_customschemeid,
        t1.materialschemeid,

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表.sql

@@ -14,6 +14,7 @@ SELECT t1.itemid,
        t1.packageqty,
        t1.iscustomsize,
        t1.widthschemeid,
+       t1.heightschemeid,
        t1.lengthschemeid,
        t1.materialschemeid,
        t1.colorschemeid,

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表_总部订单.sql

@@ -12,6 +12,7 @@ SELECT t1.itemid,
        t1.marketprice,
        t1.iscustomsize,
        t1.widthschemeid,
+       t1.heightschemeid,
        t1.lengthschemeid,
        t1.materialschemeid,
        t1.colorschemeid,

src/custom/restcontroller/webmanage/sale/order/SQL/查询可添加商品列表_特殊订单.sql

@@ -14,6 +14,7 @@ SELECT t1.itemid,
        t1.packageqty,
        t1.iscustomsize,
        t1.widthschemeid,
+       t1.heightschemeid,
        t1.lengthschemeid,
        t1.materialschemeid,
        t1.colorschemeid,

src/custom/restcontroller/webmanage/sale/order/SQL/订单商品明细_列表.sql

@@ -41,6 +41,7 @@ SELECT t1.sa_orderitemsid,
        t3.spec,
        t3.iscustomsize,
        t3.widthschemeid,
+       t3.heightschemeid,
        t3.lengthschemeid,
        ifnull(t3.packageqty,0) packageqty,
        ifnull(t3.delivery, 0)         delivery,

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

@@ -194,7 +194,7 @@ public class sizecustomizedscheme extends Controller {
                     .runSqlQuery("select * from sa_sizecustomizedscheme where status !='新建' and siteid='" + siteid
                             + "' and sa_sizecustomizedschemeid='" + sa_sizecustomizedschemeid + "'");
             Rows RowsCount = dbConnect
-                    .runSqlQuery("select * from plm_item where (widthschemeid=" + sa_sizecustomizedschemeid + " or lengthschemeid=" + sa_sizecustomizedschemeid + ") and siteid='" + siteid + "'");
+                    .runSqlQuery("select * from plm_item where (widthschemeid=" + sa_sizecustomizedschemeid + " or lengthschemeid=" + sa_sizecustomizedschemeid + " or heightschemeid="+sa_sizecustomizedschemeid+") and siteid='" + siteid + "'");
 
             if (RowsStatus.isNotEmpty()) {
                 batchDeleteErr.addErr(sa_sizecustomizedschemeid, "非新建状态的尺寸定制方案无法删除");