Merge branch 'develop' into develop2

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

@@ -204,6 +204,17 @@ public class OrderImport extends Controller {
                                 iserr = true;
                                 row.put("msg", "宽度不为数字格式，请检查");
                                 rowserr.add(row);
+                            }else if(itemsRows.get(0).getBoolean("iscustomsize") && itemsRows.get(0).getLong("pricingmetod")==1 && itemsRows.get(0).getString("spec").equals("custom")){
+                                if((StringUtils.isBlank(row.getString("length"))?0:row.getDouble("length"))==0){
+                                    iserr = true;
+                                    row.put("msg", "此商品必须填写长宽");
+                                    rowserr.add(row);
+                                }
+                                if((StringUtils.isBlank(row.getString("width"))?0:row.getDouble("width"))==0){
+                                    iserr = true;
+                                    row.put("msg", "此商品必须填写长宽");
+                                    rowserr.add(row);
+                                }
                             }else{
                                 row.put("itemid", itemsRows.get(0).getString("itemid"));
                                 rowssuc.add(row);
@@ -215,7 +226,7 @@ public class OrderImport extends Controller {
                         }
 
                     } else {
-                        Rows itemsRows = dbConnect.runSqlQuery("select itemid from plm_item where itemno='"
+                        Rows itemsRows = dbConnect.runSqlQuery("select itemid,iscustomsize,pricingmetod,spec from plm_item where itemno='"
                                 + row.getString("itemno").trim() + "' and siteid='" + siteid + "'");
                         if (!itemsRows.isEmpty()) {
                             if(!isNumeric(row.getString("qty"))){
@@ -230,6 +241,17 @@ public class OrderImport extends Controller {
                                 iserr = true;
                                 row.put("msg", "宽度不为数字格式，请检查");
                                 rowserr.add(row);
+                            }else if(itemsRows.get(0).getBoolean("iscustomsize") && itemsRows.get(0).getLong("pricingmetod")==1 && itemsRows.get(0).getString("spec").equals("custom")){
+                                if((StringUtils.isBlank(row.getString("length"))?0:row.getDouble("length"))==0){
+                                    iserr = true;
+                                    row.put("msg", "此商品必须填写长宽");
+                                    rowserr.add(row);
+                                }
+                                if((StringUtils.isBlank(row.getString("width"))?0:row.getDouble("width"))==0){
+                                    iserr = true;
+                                    row.put("msg", "此商品必须填写长宽");
+                                    rowserr.add(row);
+                                }
                             }else{
                                 row.put("itemid", itemsRows.get(0).getString("itemid"));
                                 rowssuc.add(row);
@@ -339,7 +361,12 @@ public class OrderImport extends Controller {
                             defaultprice = itemPrice.getMarketprice();
                             break;
                         default:
-                            defaultprice = itemPrice.getContractprice();
+                            if(itemRow.getBoolean("iscustomsize") && itemRow.getLong("pricingmetod")==1 && itemRow.getString("spec").equals("custom")){
+                                defaultprice = itemPrice.getContractprice().multiply(new BigDecimal(itemRow.getString("length"))).multiply(new BigDecimal(itemRow.getString("width"))).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP);
+                            }else{
+                                defaultprice = itemPrice.getContractprice();
+                            }
+
                     }
 
                     // 单价,折后价（元）,取合同价

src/custom/restcontroller/webmanage/sale/order/SQL/查询商品信息.sql

@@ -9,6 +9,8 @@ SELECT t1.itemid,
        t1.orderaddqty_auxunit,
        t1.orderaddqty,
        t1.iscustomsize,
+       t1.spec,
+       t1.pricingmetod,
        t1.width,
        t1.length,
        ifnull(t1.delivery,0) delivery,