Merge branch 'develop' into develop2

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

@@ -11,4 +11,4 @@ values ($siteid$, $itemid$, $username$, CURRENT_TIME, $userid$, $username$, CURR
         $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$, $pricingmetod$,$cheekschemeid$,$colorschemeid$,$materialschemeid$,$cost,$grossprofit$,$grossprofitmargin$,$saleprice$)
+        $marketingcategory$, $pricingmetod$,$cheekschemeid$,$colorschemeid$,$materialschemeid$,$cost$,$grossprofit$,$grossprofitmargin$,$saleprice$)

src/custom/service/AutoDockItemService.java

@@ -137,6 +137,10 @@ public class AutoDockItemService extends ServiceController {
                         sqlFactory.addParameter("volume", jsonObject.getBigDecimalValue("fvolume"));
                         sqlFactory.addParameter("pricingmetod", "2");
 
+                        sqlFactory.addParameter("saleprice", 0);
+                        sqlFactory.addParameter("cost", 0);
+                        sqlFactory.addParameter("grossprofit", 0);
+                        sqlFactory.addParameter("grossprofitmargin", 0);
 
                         sqlList.add(sqlFactory.getSQL());
                         // 货品档案扩展属性字段表