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

src/custom/beans/wms/Wms.java

@@ -216,6 +216,6 @@ public class Wms {
      * @throws YosException
      */
     public static void deleteMQOrder(String billno, int rowno) throws YosException {
-        new DBConnect("U8-YUNl_DB").runSqlUpdate("delete from Wms_Rdrecord32 where WMSstatus=0 and billno='" + billno + "' and rowno='" + rowno + "'");
+        new DBConnect("U8-YUNl_DB").runSqlUpdate("delete from Wms_Rdrecord32 where WMSstatus=0 and ccode='" + billno + "' and rowno='" + rowno + "'");
     }
 }

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

@@ -416,6 +416,10 @@ public class stockbill extends Controller {
                 }
             }
         }
+        if(billtypes.contains("返修入库")){
+            querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model");
+        }
+
 
         return getSucReturnObject().setData(rows).toString();
     }

src/custom/restcontroller/webmanage/sale/stockbill/stockbillitems.java

@@ -249,7 +249,7 @@ public class stockbillitems extends Controller {
                         depname=departmentrows.get(0).getString("depname");
                     }
                     if(depname.equals("售后部")){
-                        Rows orderRows =dbConnect.runSqlQuery("select * from sa_order where sa+sa_orderid="+iteminfo.getLongValue("sa_orderid"));
+                        Rows orderRows =dbConnect.runSqlQuery("select * from sa_order where sa_orderid="+iteminfo.getLongValue("sa_orderid"));
                         if(orderRows.isNotEmpty()){
                             sqlList.add("update st_stockbill set name='"+orderRows.get(0).getString("contact")+"',phonenumber='"+orderRows.get(0).getString("phonenumber")+"',address='"+orderRows.get(0).getString("address")+"' where st_stockbillid="+st_stockbillid);
                         }