Merge remote-tracking branch 'origin/develop' into develop

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/restcontroller/webmanage/site/site.java

@@ -11,6 +11,10 @@ import common.data.Row;
 import common.data.Rows;
 import common.data.RowsMap;
 import common.data.SQLFactory;
+import org.apache.commons.collections4.bag.SynchronizedSortedBag;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
 
 @API(title = "企业站点管理")
 public class site extends Controller {
@@ -141,6 +145,15 @@ public class site extends Controller {
         if (isupdate) {
             dbConnect.runSqlUpdate(updateSQl.toString());
         }
+        ArrayList<String> sqlList = new ArrayList<>();
+        if(StringUtils.isNotBlank(content.getString("defaultlevelprice"))){
+            Rows itemrows = dbConnect.runSqlQuery("select t1.itemid,t2.price from plm_item t1 inner join sa_itemprice t2 on t1.itemid = t2.itemid AND t1.siteid = t2.siteid and t2.pricegrade='"+content.getString("defaultlevelprice")+"' where ifnull(t1.saleprice,0)=0 and t1.siteid='"+siteid+"'");
+            for (Row row :itemrows){
+                System.err.println("update plm_item set saleprice="+row.getBigDecimal("price")+" where itemid="+row.getLong("itemid"));
+                sqlList.add("update plm_item set saleprice="+row.getBigDecimal("price")+" where itemid="+row.getLong("itemid"));
+            }
+        }
+        dbConnect.runSqlUpdate(sqlList);
         return querySite_Parameter();
     }
 

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());
                         // 货品档案扩展属性字段表