Parcourir la source

欠货查询明细行冻结显示,查询经销商后该明细也要过滤经销商及企业档案联系电话相同保存时给与提示

hu il y a 2 ans
Parent
commit
bb2b8db4f5

+ 1 - 1
src/custom/beans/order/Order.java

@@ -109,7 +109,7 @@ public class Order extends BaseClass {
     }
 
     /**
-     * 获取企业订单默认扣款账户
+     * 获取企业订订单类型默认可重复添加设置
      *
      * @param siteid    站点
      * @param ordertype 订单类型 (如标准订单、项目订单)

+ 4 - 0
src/custom/restcontroller/webmanage/sale/enterprise/enterprise.java

@@ -432,6 +432,10 @@ public class enterprise extends Controller {
         sqlFactory.addParameter("enterprisename", content.getStringValue("enterprisename", tablename));
         sqlFactory.addParameter("address", content.getStringValue("address", tablename));
         sqlFactory.addParameter("contact", content.getStringValue("contact", tablename));
+        Rows rows =dbConnect.runSqlQuery("select t1.sys_enterpriseid,t2.agentnum from sys_enterprise t1 left join sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid where t1.sys_enterpriseid!="+sys_enterpriseid+" and t1.siteid='"+siteid+"' and t1.phonenumber='"+ content.getStringValue("phonenumber", tablename)+"'");
+        if(!rows.isEmpty()){
+            return getErrReturnObject().setErrMsg("与经销商编码"+rows.get(0).getString("agentnum")+"联系方式重复,无法保存").toString();
+        }
         sqlFactory.addParameter("phonenumber", content.getStringValue("phonenumber", tablename));
         sqlFactory.addParameter("province", content.getStringValue("province", tablename));
         sqlFactory.addParameter("city", content.getStringValue("city", tablename));

+ 2 - 1
src/custom/restcontroller/webmanage/sale/invbal/SQL/未发货订单明细列表.sql

@@ -8,7 +8,8 @@ SELECT t3.sonum,
        t3.submitdate,
        t4.unitname,
        t1.qty,
-       t1.undeliqty
+       t1.undeliqty,
+       t1.isfreeze
 FROM sa_orderitems t1
          inner join plm_item t2 on t1.siteid = t2.siteid and t1.itemid = t2.itemid
          inner join sa_order t3 on t1.siteid=t3.siteid and t1.sa_orderid=t3.sa_orderid