快递信息单部分功能

src/custom/restcontroller/webmanage/sale/expressform/expressform.java

@@ -47,24 +47,24 @@ public class expressform extends Controller {
         String rcv_county = content.getStringValue("rcv_county");
         String rcv_address = content.getStringValue("rcv_address");
         long expresssdrid = content.getLongValue("expresssdrid");
-        String orderby="";
-        if(fpriority_ads.equals("配件>常规")){
-            orderby="desc";
-        }else{
-            orderby="asc";
-        }
-        Rows rcvRows =dbConnect.runSqlQuery("select * from sys_enterprise_contacts where workaddress=1 and sys_enterpriseid="+sys_enterpriseid+" order by case when type='配件' then 1 else 0 end "+orderby);
-        if(rcvRows.isNotEmpty()){
-            rcv_name=rcvRows.get(0).getString("name");
-            rcv_phone=rcvRows.get(0).getString("phonenumber");
-            rcv_mobile=rcvRows.get(0).getString("telephone");
-            rcv_prov=rcvRows.get(0).getString("province");
-            rcv_city=rcvRows.get(0).getString("city");
-            rcv_county=rcvRows.get(0).getString("county");
-            rcv_address=rcvRows.get(0).getString("address");
-        }
-        if (expressformid <= 0) {
 
+        if (expressformid <= 0) {
+            String orderby="";
+            if(fpriority_ads.equals("配件>常规")){
+                orderby="desc";
+            }else{
+                orderby="asc";
+            }
+            Rows rcvRows =dbConnect.runSqlQuery("select * from sys_enterprise_contacts where workaddress=1 and sys_enterpriseid="+sys_enterpriseid+" order by case when type='配件' then 1 else 0 end "+orderby);
+            if(rcvRows.isNotEmpty()){
+                rcv_name=rcvRows.get(0).getString("name");
+                rcv_phone=rcvRows.get(0).getString("phonenumber");
+                rcv_mobile=rcvRows.get(0).getString("telephone");
+                rcv_prov=rcvRows.get(0).getString("province");
+                rcv_city=rcvRows.get(0).getString("city");
+                rcv_county=rcvRows.get(0).getString("county");
+                rcv_address=rcvRows.get(0).getString("address");
+            }
             expressformid = createTableID(tableName);
             InsertSQL insertSQL = SQLFactory.createInsertSQL(this, tableName);
             insertSQL.setUniqueid(expressformid);

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

@@ -454,7 +454,7 @@ public class OrderItems extends Controller {
         Rows packagetypemxrows = dbConnect.runSqlQuery(packagetypemxsql);
         sa_orderitemsids.addAll(packagetypemxrows.toJsonArray("sa_orderitemsid"));
 
-        String sqldetail ="select t1.sa_workorderid,t1.itemid from sa_orderitems siteid='"+siteid+"' and sa_orderitemsid in"+sa_orderitemsids.toJSONString();
+        String sqldetail ="select t1.sa_workorderid,t1.itemid from sa_orderitems where siteid='"+siteid+"' and sa_orderitemsid in"+sa_orderitemsids.toJSONString();
         sqldetail = sqldetail.replace("[", "(").replace("]", ")");
         Rows rowsdetail = dbConnect.runSqlQuery(sqldetail);
         for(Row row : rowsdetail ){