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

src/custom/restcontroller/webmanage/sale/dispatch/SQL/商品发货数量汇总.sql

@@ -3,4 +3,4 @@ SELECT  t3.itemno,
 FROM sa_dispatch_items t1
          inner join sa_dispatch t2 on t1.siteid = t2.siteid and t1.sa_dispatchid = t2.sa_dispatchid
          left join plm_item t3 on t1.siteid = t3.siteid and t1.itemid = t3.itemid
-WHERE t2.STATUS in ('审核','复核') and t1.siteid=$siteid$ and t3.itemno in $itemnos$ group by t3.itemno
+WHERE t2.STATUS in ('审核','复核') and t1.siteid=$siteid$ and t3.itemno in $itemno$ group by t3.itemno

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

@@ -31,6 +31,7 @@ import restcontroller.webmanage.executorService.Executor;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -2828,7 +2829,8 @@ public class Order extends Controller {
         // 领域
         sqlFactory.addParameter("tradefield", row.getString("tradefield"));
         //单据日期
-        sqlFactory.addParameter("billdate", new Date());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        sqlFactory.addParameter("billdate", sdf.format(new Date()));
         sqlFactory.addParameter("rebate_userate", row.getBigDecimal("rebate_userate"));
         if (row.getBoolean("rebate_used")) {
             sqlFactory.addParameter("rebate_used", 1);