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

src/custom/restcontroller/webmanage/sale/customer/Customer.java

@@ -985,6 +985,11 @@ public class Customer extends Controller {
                 where.append(" or t4.sys_enterpriseid ='").append(whereObject.getString("sys_enterpriseid")).append("' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("phonenumber") && !"".equals(whereObject.getString("phonenumber"))) {
+                where.append(" and(");
+                where.append("t1.phonenumber ='").append(whereObject.getString("phonenumber")).append("' ");
+                where.append(")");
+            }
         }
         QuerySQL querySQL;
         querySQL = SQLFactory.createQuerySQL(this, "sa_customers", "sa_customersid","name","phonenumber","province","city","county","address","createdate","sa_agentsid","sa_agentsid_to");
@@ -1025,6 +1030,12 @@ public class Customer extends Controller {
                 where.append("t1.name like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("phonenumber") && !"".equals(whereObject.getString("phonenumber"))) {
+                where.append(" and(");
+                where.append("t1.phonenumber ='").append(whereObject.getString("phonenumber")).append("' ");
+                where.append(")");
+            }
+
         }
         QuerySQL querySQL;
         querySQL = SQLFactory.createQuerySQL(this, "sa_customers", "sa_customersid","name","phonenumber","province","city","county","address","createdate","sa_agentsid","sa_agentsid_to");

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

@@ -2066,7 +2066,7 @@ public class Order extends Controller {
                     insertSQL.setValue("typemx", "");
                     insertSQL.setValue("sa_supplierid", 0);
                     insertSQL.setValue("rb", 1);
-                    insertSQL.setValue("remarks", orderdetailRows.toJsonArray("remarks").toString().replace("[", "").replace("]", ""));
+                    insertSQL.setValue("remarks", orderdetailRows.toJsonArray("remarks").toString().replace("[", "").replace("]", "").replace("\"",""));
                     insertSQL.setDateValue("billdate");
                     insertSQL.setValue("billno", createBillCode("stockbill"));
 

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

@@ -237,9 +237,9 @@ public class stockbill extends Controller {
         RowsMap rowsMap =rows.toRowsMap("st_stockbillid");
         RowsMap periodrowsMap =dbConnect.runSqlQuery("select CONCAT(year, '-',LPAD(month, 2, '0')) period,isclose from st_period").toRowsMap("isclose");
 
-        if(periodrowsMap.get("1").toRowsMap("period").containsKey(period)){
-            return getErrReturnObject().setErrMsg("原单据会计期间已关闭，不可调整").toString();
-        }
+//        if(periodrowsMap.get("1").toRowsMap("period").containsKey(period)){
+//            return getErrReturnObject().setErrMsg("原单据会计期间已关闭，不可调整").toString();
+//        }
         for (Object o : st_stockbillids) {
             long st_stockbillid = Long.parseLong(o.toString());
             if(rowsMap.containsKey(st_stockbillid)){