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

# Conflicts:
#	pom.xml

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

@@ -386,6 +386,9 @@ public class agents extends Controller {
         sqlFactory.addParameter("invoicingpoint", content.getLongValue("invoicingpoint") == 0 ? 2 : content.getLongValue("invoicingpoint"));
         //是否需要经营授权,默认1
         sqlFactory.addParameter("saleclassauth", !content.getBooleanValue("saleclassauth") ? 0 : 1);
+        if(content.getLongValue("grade")==0){
+            return getErrReturnObject().setErrMsg("请选择商户等级").toString();
+        }
         sqlFactory.addParameter("grade", content.getLongValue("grade"));
         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
         sqlFactory.addParameter("siteid", siteid);

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -269,6 +269,10 @@ public class Item extends Controller {
 
         sqlList.add(sqlFactory.getSQL());
         // 货品档案扩展属性字段表
+        Rows rows=dbConnect.runSqlQuery("SELECT * from plm_itemextend WHERE itemid='"+itemid+"' and siteid='"+siteid+"'");
+        if(rows.isNotEmpty()){
+            plm_itemextendid = rows.get(0).getLong("plm_itemextendid");
+        }
 
         sqlFactory = new SQLFactory(this, "货品档案-扩展新增");
         if (plm_itemextendid <= 0) {

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

@@ -3184,14 +3184,9 @@ public class Order extends Controller {
         if (sa_accountclassid <= 0) {
             return getErrReturnObject().setErrMsg("请选择支付账号").toString();
         }
-//        if (siteid.equals("TZ")) {
-//            if (StringUtils.isBlank(reviewtype)) {
-//                return getErrReturnObject().setErrMsg("订单评审类型为空，无法审核").toString();
-//            }
-//        }
-//        if (StringUtils.isBlank(row.getString("saletype"))) {
-//            return getErrReturnObject().setErrMsg("销售分类为空，无法审核").toString();
-//        }
+        if(!row.getString("status").equals("提交")){
+            return getErrReturnObject().setErrMsg("非提交状态不可审核").toString();
+        }
 
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");
@@ -3308,6 +3303,9 @@ public class Order extends Controller {
             return getErrReturnObject().setErrMsg("存在销售出库单，无法反审核").toString();
         }
 
+        if(!row.getString("status").equals("审核")){
+            return getErrReturnObject().setErrMsg("非审核状态不可反审核").toString();
+        }
 
         //通过版本更新订单表头数据
         beans.order.Order.updateOrderWithVersion(this);