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

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -405,13 +405,14 @@ public class cashbill extends Controller {
 
         Long sa_cashbillid = content.getLong("sa_cashbillid");
         String subclass = content.getStringValue("subclass");
+        String class1 = content.getStringValue("class");
 
         Rows cashbillRows = dbConnect.runSqlQuery("select * from sa_cashbill where siteid='"+siteid+"' and sa_cashbillid="+sa_cashbillid);
         if (cashbillRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("收支凭证不存在").toString();
         }
 
-        dbConnect.runSqlUpdate("update sa_cashbill set subclass='"+subclass+"' where sa_cashbillid="+sa_cashbillid);
+        dbConnect.runSqlUpdate("update sa_cashbill set subclass='"+subclass+"',class='"+class1+"' where sa_cashbillid="+sa_cashbillid);
 
 
         return queryCashbillMain();

src/custom/restcontroller/webmanage/sale/order/SQL/更新订单明细分类.sql

@@ -0,0 +1,7 @@
+update sa_order
+set changeuserid=$userid$,
+    changeby = $username$,
+    changedate = current_time,
+    typemx = $typemx$
+where siteid = $siteid$
+  and sa_orderid = $sa_orderid$

src/custom/service/AutoDockItemService.java

@@ -53,11 +53,13 @@ public class AutoDockItemService extends ServiceController {
                 if(!itemRowsMapAll.containsKey(jsonObject.getString("fitemno"))){
                     long itemid = createTableID("plm_item");
                     SQLFactory sqlFactory = new SQLFactory(new Item(jsonObject), "货品档案新增");
+
                     sqlFactory.addParameter("siteid", siteid);
                     sqlFactory.addParameter("itemid", createTableID("plm_item"));
                     sqlFactory.addParameter("username", "admin");
                     sqlFactory.addParameter("userid", 1);
                     sqlFactory.addParameter("itemno", jsonObject.getString("fitemno"));
+                    sqlFactory.addParameter("marketingcategory", "");
                     if(unitRowsMap.containsKey(jsonObject.getString("funit"))){
                         sqlFactory.addParameter("unitid", unitRowsMap.get(jsonObject.getString("funit")).get(0).getLong("unitid"));
                     }else {
@@ -127,6 +129,7 @@ public class AutoDockItemService extends ServiceController {
                     sqlFactory.addParameter("financeclasstype", jsonObject.getStringValue("fdescription"));
                     sqlFactory.addParameter("stockno", jsonObject.getStringValue("fstockno"));
                     sqlFactory.addParameter("volume", jsonObject.getBigDecimalValue("fvolume"));
+                    sqlFactory.addParameter("pricingmetod", "1");
 
 
                     sqlList.add(sqlFactory.getSQL());