浏览代码

Merge branch 'develop' into develop2

# Conflicts:
#	src/custom/restcontroller/webmanage/sale/promotion/promotion.java
hu 10 月之前
父节点
当前提交
7140c37ac1
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      src/custom/restcontroller/webmanage/sale/promotion/promotion.java

+ 5 - 0
src/custom/restcontroller/webmanage/sale/promotion/promotion.java

@@ -582,6 +582,11 @@ public class promotion extends Controller {
 
 
 
 
 
 
+            Rows rowsdetailshuizong = dbConnect.runSqlQuery("select * from (select t2.itemno,count(1) count from sa_promotion_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.sa_promotionid ='"
+                            + sa_promotionid + "' and  t1.siteid='" + siteid + "' group by t1.itemid,t2.itemno,t1.orderminqty,t1.orderaddqty,t1.groupqty) t where t.count>1");
+            if(rowsdetailshuizong.isNotEmpty()){
+                return getErrReturnObject().setErrMsg("商品编码:"+rowsdetailshuizong.get(0).getString("itemno")+"重复添加,禁止审核!").toString();
+            }
 
 
         }
         }