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

src/custom/restcontroller/R.java

@@ -7568,6 +7568,11 @@ public class R {
         }
     }
 
+    public static class ID2026042815542102 {
+        public static class v1 {
+        }
+    }
+
     public static class ID2026041113372302 {
         public static class v1 {
         }
@@ -7752,6 +7757,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2026042813154102 {
+        public static class v1 {
+        }
+    }
 }
 
 

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/contracttask/ESignContractTemplate.java

@@ -33,6 +33,7 @@ public class ESignContractTemplate extends Controller {
         insertSQL.setSiteid(siteid);
         insertSQL.setUniqueid(sa_esign_contract_templateid);
         insertSQL.setValue("name", content.getStringValue("name"));
+        insertSQL.setValue("templatename", content.getStringValue("templatename"));
         insertSQL.setValue("type", content.getStringValue("type"));
         insertSQL.setValue("isenable", isenable);
         if (isenable) {

src/custom/restcontroller/webmanage/sale/contracttask/EsignContractTask.java

@@ -102,9 +102,10 @@ public class EsignContractTask extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_esign_contract_template", "t2", "t1.sa_esign_contract_templateid=t2.sa_esign_contract_templateid",
                 "type", "templateid", "name");
         querySQL.setSiteid(siteid);
-        if (getDepartment(userid).getString("depname").equals("区域经理")) {
+        if (usertype==2) {
             querySQL.setWhere("t1.createuserid", userid);
         }
+        querySQL.setOrderBy("t1.createdate desc");
         querySQL.setCondition("t1.taskname","t1.remarks","t2.name");
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();

src/custom/restcontroller/webmanage/sale/contracttask/EsignContractTaskMX.java

@@ -101,13 +101,13 @@ public class EsignContractTaskMX extends Controller {
             querySQL.setWhere("t3.balance>0");
             querySQL.setWhere("t4.accountno='02'");
         }
-        if (getDepartment(userid).getString("depname").equals("区域经理")) {
+        if (usertype==2) {
             querySQL.setWhere("t1.sys_enterpriseid in (SELECT sys_enterpriseid FROM sys_enterprise_tradefield WHERE hrid=" + hrid + ")");
         }
         querySQL.setWhere("t1.status=1");
         querySQL.setWhere("NOT EXISTS (SELECT 1 from sa_esign_contract_taskmx WHERE sa_agentsid=t1.sa_agentsid and sa_esign_contract_taskid='" + sa_esign_contract_taskid + "' )");
         querySQL.setSiteid(siteid);
-        querySQL.setCondition("t2.enterprisename","t2.abbreviation","t1.agentnum");
+        querySQL.setCondition("t2.enterprisename", "t2.abbreviation", "t1.agentnum");
         querySQL.setOrderBy("t1.createdate desc");
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
@@ -178,6 +178,26 @@ public class EsignContractTaskMX extends Controller {
         return getSucReturnObject().toString();
     }
 
+    @API(title = "电子签合同任务明细-一键修改期限", apiversion = R.ID2026042813154102.v1.class)
+    public String newApiMethod() throws YosException {
+
+        Long sa_esign_contract_taskid = content.getLongValue("sa_esign_contract_taskid");
+        String begindate = content.getStringValue("begindate");
+        String enddate = content.getStringValue("enddate");
+
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_esign_contract_taskmx");
+        updateSQL.setSiteid(siteid);
+        updateSQL.setWhere("sa_esign_contract_taskid", sa_esign_contract_taskid);
+        updateSQL.setValue("begindate", begindate);
+        updateSQL.setValue("enddate", enddate);
+        updateSQL.update();
+
+        DataContrlLog.createLog(this, "sa_esign_contract_task", sa_esign_contract_taskid, "一键修改期限", "一键修改期限为：" + begindate + "~" + enddate).insert();
+
+        return getSucReturnObject().toString();
+    }
+
+
     @API(title = "电子签合同任务明细-修改季度任务金额", apiversion = R.ID2026042113202402.v1.class)
     public String changeTaskMoney() throws YosException {
 
@@ -319,7 +339,7 @@ public class EsignContractTaskMX extends Controller {
         Row agentRow = ContractTaskUtil.getAgentRow(this, sa_agentsid);
         Row enterpriseRow = ContractTaskUtil.getEnterpriseRow(this, sys_enterpriseid);
         //校验参数
-        ContractTaskUtil.check(this,  enterpriseRow,agentRow, taskmxrow);
+        ContractTaskUtil.check(this, enterpriseRow, agentRow, taskmxrow);
         BigDecimal securitydeposit = ContractTaskUtil.getSecurityDeposit(this, sys_enterpriseid);
 
         String license_name = content.getStringValue("license_name");
@@ -440,10 +460,11 @@ public class EsignContractTaskMX extends Controller {
         querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid",
                 "agentnum");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid", "enterprisename", "abbreviation");
-        if (getDepartment(userid).getString("depname").equals("区域经理")) {
+        if (usertype==2) {
             querySQL.setWhere(" exists(select 1 from  sys_enterprise_tradefield where sa_agentsid=t1.sa_agentsid and hrid=" + hrid + " )");
         }
         querySQL.setSiteid(siteid);
+        querySQL.setOrderBy("t1.createdate desc");
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
 

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);

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

@@ -398,11 +398,24 @@ public class serviceorder extends Controller {
         } else {
             row.put("backreason", "");
         }
-
+        row.putIfAbsent("noticedate","");
 
         return getSucReturnObject().setData(row).toString();
     }
 
+    @API(title = "通知时间", apiversion = R.ID2026042815542102.v1.class)
+    public String updateNoticeDate() throws YosException {
+        Long sa_serviceorderid = content.getLongValue("sa_serviceorderid");
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");
+        updateSQL.setUniqueid(sa_serviceorderid);
+        updateSQL.setSiteid(siteid);
+        updateSQL.setValue("noticedate", getDateTime_Str());
+        updateSQL.update();
+        DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "通知时间", "已通知").insert();
+        return getSucReturnObject().toString();
+    }
+
+
     @API(title = "服务申请单详情（不验证token））", apiversion = R.ID20230217133003.v1.class, accesstoken = false)
     public String queryserviceorderMainWithoutToken() throws YosException {
         Long sa_serviceorderid = content.getLong("sa_serviceorderid");