Ver código fonte

一键发货备注带入定制属性

eganwu 1 ano atrás
pai
commit
ed0a8639d8

+ 2 - 2
src/custom/restcontroller/webmanage/sale/dispatch/dispatch.java

@@ -1043,7 +1043,7 @@ public class dispatch extends Controller {
 //            dispatchitemsRowsMap = dbConnect.runSqlQuery("select sa_orderid,sa_orderitemsid,ifnull(sum(qty),0) qty from sa_dispatch t1 inner join sa_dispatch_items t2 on t1.siteid=t2.siteid and t1.sa_dispatchid=t2.sa_dispatchid where t1.siteid='" + siteid + "' and t1.status in ('复核','关闭') group by t1.sa_orderid,t2.sa_orderitemsid").toRowsMap("sa_orderitemsid");
 //        }
 
-        Rows orderitemsRows = dbConnect.runSqlQuery("select itemid,itemno,sa_orderitemsid,undeliqty,remarks from sa_orderitems where siteid='" + siteid + "' and sa_orderitemsid in " + sa_orderitemsids.toString().replace("[", "(").replace("]", ")"));
+        Rows orderitemsRows = dbConnect.runSqlQuery("select itemid,itemno,sa_orderitemsid,undeliqty,remarks,customproperties from sa_orderitems where siteid='" + siteid + "' and sa_orderitemsid in " + sa_orderitemsids.toString().replace("[", "(").replace("]", ")"));
         Long rowno = 1L;
         for (Row row : orderitemsRows) {
             String sa_orderitemsid = row.getString("sa_orderitemsid");
@@ -1077,7 +1077,7 @@ public class dispatch extends Controller {
             sqlFactory.addParameter("qty", qty);
             sqlFactory.addParameter("batchcontrol", 0);
             sqlFactory.addParameter("batchno", "");
-            sqlFactory.addParameter("remarks", row.getString("remarks"));
+            sqlFactory.addParameter("remarks", row.getString("customproperties"));
             sqlFactory.addParameter("userid", userid);
             sqlFactory.addParameter("username", username);
             sqlList.add(sqlFactory.getSQL());