商品档案增加启用状态判断及账户余额收支凭证增加优惠金额

src/custom/beans/accountbalance/Accountbalance.java

@@ -158,7 +158,7 @@ public class Accountbalance extends BaseClass {
                 BigDecimal newbalance = cashbillEntity.getAmount().add(rowsaccountbalance.get(0).getBigDecimal("balance"));
                 BigDecimal newdiscountamount = cashbillEntity.getDiscountamountamount().add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
                 sqlList.add("update sa_accountbalance set balance='" + newbalance
-                        + "',newdiscountamount='"+newdiscountamount+"',changedate=CURRENT_TIME,changeby ='" + controller.username + "',changeuserid='"
+                        + "',discountamount='"+newdiscountamount+"',changedate=CURRENT_TIME,changeby ='" + controller.username + "',changeuserid='"
                         + controller.userid + "' where sys_enterpriseid ='" + sys_enterpriseid
                         + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + controller.siteid
                         + "'");

src/custom/restcontroller/R.java

@@ -5962,6 +5962,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025070114584703 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/sale/cashbill/SQL/收支凭证列表查询.sql

@@ -11,6 +11,7 @@ SELECT t1.sa_cashbillid,
        t3.accountno,
        t3.accountname,
        ifnull(t1.amount, 0)            amount,
+       ifnull(t1.discountamount, 0)   discountamount,
        t1.status,
        t1.source,
        t1.sourcenote,

src/custom/restcontroller/sale/cashbill/SQL/收支凭证新增.sql

@@ -1,7 +1,7 @@
 insert into sa_cashbill (siteid, sa_cashbillid, createuserid, createby, createdate, billno, changeuserid, changeby,
                          changedate,
                          sys_enterpriseid, sa_accountclassid, type, remarks, amount, status, source, sourcenote,
-                         subclass, class, ownertable, ownerid,period)
+                         subclass, class, ownertable, ownerid,period,discountamount)
 values ($siteid$, $sa_cashbillid$, $userid$, $username$, CURRENT_TIME, $billno$, $userid$, $username$, CURRENT_TIME,
         $sys_enterpriseid$, $sa_accountclassid$, $type$, $remarks$,
-        $amount$, '新建', $source$, $sourcenote$, $subclass$, $class$, $ownertable$, $ownerid$,$period$);
+        $amount$, '新建', $source$, $sourcenote$, $subclass$, $class$, $ownertable$, $ownerid$,$period$,$discountamount$);

src/custom/restcontroller/sale/cashbill/SQL/收支凭证更新.sql

@@ -11,7 +11,8 @@ SET
     remarks = $remarks$,
     subclass=$subclass$,
     class=$class$,
-    period=$period$
+    period=$period$,
+    discountamount=$discountamount$
 WHERE sa_cashbillid= $sa_cashbillid$ and siteid=$siteid$
 
 

src/custom/restcontroller/sale/cashbill/SQL/收支凭证详情查询.sql

@@ -8,6 +8,7 @@ SELECT t1.sa_cashbillid,
        t3.accountno,
        t3.accountname,
        ifnull(t1.amount, 0)            amount,
+       ifnull(t1.discountamount, 0)   discountamount,
        t1.status,
        t1.source,
        t1.sourcenote,

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -231,6 +231,7 @@ public class cashbill extends Controller {
                     sqlFactoryupload.addParameter("ownerid", 0);
                     sqlFactoryupload.addParameter("source", "");
                     sqlFactoryupload.addParameter("sourcenote", "");
+                    sqlFactoryupload.addParameter("discountamount", 0);
                     if (StringUtils.isBlank(row.getString("period"))) {
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                         sqlFactoryupload.addParameter("period", sdf.format(new Date()));
@@ -320,6 +321,7 @@ public class cashbill extends Controller {
             }
         }
         BigDecimal amount = content.getBigDecimal("amount");
+        BigDecimal discountamount = content.getBigDecimal("discountamount");
         String remarks = content.getString("remarks");
         ArrayList<String> sqlList = new ArrayList<>();
         if (sa_cashbillid <= 0 || dbConnect
@@ -347,6 +349,8 @@ public class cashbill extends Controller {
             sqlFactory.addParameter("source", "");
             sqlFactory.addParameter("sourcenote", "");
             sqlFactory.addParameter("period", period);
+            sqlFactory.addParameter("discountamount", discountamount);
+
             content.put("sa_cashbillid", sa_cashbillid);
             sqlList.add(sqlFactory.getSQL());
             if (type == 1) {
@@ -376,6 +380,7 @@ public class cashbill extends Controller {
             sqlFactory.addParameter("source", "");
             sqlFactory.addParameter("sourcenote", "");
             sqlFactory.addParameter("period", period);
+            sqlFactory.addParameter("discountamount", discountamount);
             sqlList.add(sqlFactory.getSQL());
             sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "更新", "收支凭证更新成功").getSQL());
         }
@@ -724,7 +729,7 @@ public class cashbill extends Controller {
         //SQLFactory sqlFactoryquery = new SQLFactory(this, "信用额度调整单状态查询");
         //sqlFactoryquery.addParameter("siteid", siteid);
         //sqlFactoryquery.addParameter_in("sa_creditbillids", stringArray);
-        Rows rows = dbConnect.runSqlQuery("select t1.sa_cashbillid,t1.sys_enterpriseid,t1.sa_accountclassid,t1.status,t1.billno,t1.amount,t1.type,t1.ownerid,t2.accountname,t1.remarks from sa_cashbill t1 left join sa_accountclass t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid where t1.sa_cashbillid ='" + sa_cashbillid + "' and  t1.siteid='" + siteid + "'");
+        Rows rows = dbConnect.runSqlQuery("select t1.sa_cashbillid,t1.sys_enterpriseid,t1.sa_accountclassid,t1.status,t1.billno,t1.amount,ifnull(t1.discountamount,0) discountamount,t1.type,t1.ownerid,t2.accountname,t1.remarks from sa_cashbill t1 left join sa_accountclass t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid where t1.sa_cashbillid ='" + sa_cashbillid + "' and  t1.siteid='" + siteid + "'");
         for (Row row : rows) {
             if (row.getString("status").equals("审核")) {
                 return getErrReturnObject().setErrMsg("单号为：【" + row.getString("billno") + "】的收支凭证已审核，无法再次审核")
@@ -738,11 +743,12 @@ public class cashbill extends Controller {
 
         ArrayList<String> sqlList = new ArrayList<>();
         BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
+        BigDecimal discountamount = BigDecimal.ZERO;  //当前账户余额
         if (!rows.isEmpty()) {
             long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
             long sa_accountclassid = rows.get(0).getLong("sa_accountclassid");
             long type = rows.get(0).getLong("type");
-            Rows rowsaccountbalance = dbConnect.runSqlQuery("select sa_accountbalanceid,balance,creditquota from sa_accountbalance where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+            Rows rowsaccountbalance = dbConnect.runSqlQuery("select sa_accountbalanceid,balance,creditquota,ifnull(discountamount,0) discountamount from sa_accountbalance where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
             if (type == 1) {
                 Rows offsettingRows = dbConnect.runSqlQuery("select amount from sa_cashbill where siteid='" + siteid + "' and ownertable='sa_cashbill' and ownerid=" + rows.get(0).getLong("ownerid"));
                 if (offsettingRows.isNotEmpty()) {
@@ -756,17 +762,19 @@ public class cashbill extends Controller {
                     sqlFactory.addParameter("sa_accountclassid", sa_accountclassid);
                     sqlFactory.addParameter("siteid", siteid);
                     sqlFactory.addParameter("balance", rows.get(0).getBigDecimal("amount"));
+                    sqlFactory.addParameter("discountamount", rows.get(0).getBigDecimal("discountamount"));
                     sqlFactory.addParameter("userid", userid);
                     sqlFactory.addParameter("username", username);
                     sqlList.add(sqlFactory.getSQL());
                 } else {
-                    BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
+                    BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance")).add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
                     if ((rows.get(0).getBigDecimal("amount").add(canuseamount)).compareTo(BigDecimal.ZERO) == -1 && rows.get(0).getBigDecimal("amount").compareTo(BigDecimal.ZERO)<=0) {
                         return getErrReturnObject().setErrMsg("该营销账户可用余额不足，收入凭证无法审核")
                                 .toString();
                     }
                     balance = rows.get(0).getBigDecimal("amount").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                    sqlList.add("update sa_accountbalance set balance='" + rows.get(0).getBigDecimal("amount").add(rowsaccountbalance.get(0).getBigDecimal("balance")) + "',changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+                    discountamount = rows.get(0).getBigDecimal("discountamount").add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
+                    sqlList.add("update sa_accountbalance set balance='" + rows.get(0).getBigDecimal("amount").add(rowsaccountbalance.get(0).getBigDecimal("balance")) + "',discountamount="+discountamount+",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
                 }
 
                 sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "审核", "收入凭证审核成功").getSQL());
@@ -784,14 +792,15 @@ public class cashbill extends Controller {
                     return getErrReturnObject().setErrMsg("该营销账户不存在，支出凭证无法审核")
                             .toString();
                 } else {
-                    BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
+                    BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("amount")).add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
                     if (rows.get(0).getBigDecimal("amount").compareTo(canuseamount) == 1 ) {
                         return getErrReturnObject().setErrMsg("该营销账户可用余额不足，支出凭证无法审核")
                                 .toString();
                     }
                     BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(rows.get(0).getBigDecimal("amount"));
                     balance = newbalance;
-                    sqlList.add("update sa_accountbalance set balance='" + newbalance + "',changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+                    discountamount = rowsaccountbalance.get(0).getBigDecimal("discountamount").subtract(rows.get(0).getBigDecimal("discountamount"));
+                    sqlList.add("update sa_accountbalance set balance='" + newbalance + "',discountamount="+discountamount+",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
                 }
 
                 sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "审核", "支出凭证审核成功").getSQL());
@@ -834,7 +843,7 @@ public class cashbill extends Controller {
         //SQLFactory sqlFactoryquery = new SQLFactory(this, "信用额度调整单状态查询");
         //sqlFactoryquery.addParameter("siteid", siteid);
         //sqlFactoryquery.addParameter_in("sa_creditbillids", stringArray);
-        Rows rows = dbConnect.runSqlQuery("select checkdate,sa_cashbillid,sys_enterpriseid,sa_accountclassid,status,billno,amount,type,ownerid from sa_cashbill where sa_cashbillid ='" + sa_cashbillid + "' and  siteid='" + siteid + "'");
+        Rows rows = dbConnect.runSqlQuery("select checkdate,sa_cashbillid,sys_enterpriseid,sa_accountclassid,status,billno,amount,type,ownerid,ifnull(discountamount,0) discountamount from sa_cashbill where sa_cashbillid ='" + sa_cashbillid + "' and  siteid='" + siteid + "'");
         Date date = new Date();
         for (Row row : rows) {
             if (!row.getString("status").equals("审核")) {
@@ -853,11 +862,12 @@ public class cashbill extends Controller {
 
         ArrayList<String> sqlList = new ArrayList<>();
         BigDecimal balance = BigDecimal.ZERO;  //当前账户余额
+        BigDecimal discountamount = BigDecimal.ZERO;  //当前账户余额
         if (!rows.isEmpty()) {
             long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
             long sa_accountclassid = rows.get(0).getLong("sa_accountclassid");
             long type = rows.get(0).getLong("type");
-            Rows rowsaccountbalance = dbConnect.runSqlQuery("select sa_accountbalanceid,balance,creditquota from sa_accountbalance where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+            Rows rowsaccountbalance = dbConnect.runSqlQuery("select sa_accountbalanceid,balance,creditquota,ifnull(discountamount,0) discountamount from sa_accountbalance where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
             //System.out.println("select sa_accountbalanceid,balance,creditquota from sa_accountbalance where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
             if (type == 1) {
                 Rows offsettingRows = dbConnect.runSqlQuery("select amount from sa_cashbill where siteid='" + siteid + "' and ownertable='sa_cashbill' and ownerid=" + rows.get(0).getLong("ownerid"));
@@ -868,14 +878,15 @@ public class cashbill extends Controller {
                     return getErrReturnObject().setErrMsg("该营销账户不存在，收入凭证无法反审核")
                             .toString();
                 } else {
-                    BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
+                    BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance")).add(rowsaccountbalance.get(0).getBigDecimal("discountamount"));
                     if (rows.get(0).getBigDecimal("amount").compareTo(canuseamount) == 1) {
                         return getErrReturnObject().setErrMsg("该营销账户可用余额不足，收入凭证无法反审核")
                                 .toString();
                     }
                     BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(rows.get(0).getBigDecimal("amount"));
                     balance = newbalance;
-                    sqlList.add("update sa_accountbalance set balance='" + newbalance + "',changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
+                    discountamount= rowsaccountbalance.get(0).getBigDecimal("discountamount").subtract(rows.get(0).getBigDecimal("discountamount"));
+                    sqlList.add("update sa_accountbalance set balance='" + newbalance + "',discountamount="+discountamount+",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
                 }
 
                 sqlList.add(DataContrlLog.createLog(this, "sa_cashbill", sa_cashbillid, "反审核", "收入凭证反审核成功").getSQL());

src/custom/restcontroller/webmanage/sale/accountclass/SQL/营销账户余额查询.sql

@@ -1,6 +1,7 @@
 SELECT t1.sa_accountbalanceid,
        ifnull(t1.balance, 0)     balance,
        ifnull(t1.creditquota, 0) creditquota,
+       ifnull(t1.discountamount, 0) discountamount,
        t1.changeuserid,
        t1.changeby,
        t1.changedate,

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

@@ -278,6 +278,8 @@ public class accountclass extends Controller {
             for (Row row : rows) {
                 row.put("balance", row.getBigDecimal("balance"));
                 row.put("creditquota", row.getBigDecimal("creditquota"));
+                row.put("discountamount", row.getBigDecimal("discountamount"));
+
             }
         }
         return getSucReturnObject().setData(rows).toString();

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

@@ -823,8 +823,8 @@ public class Item extends Controller {
             if (status.equals("0")) {
                 if (itemRowsMap.containsKey(String.valueOf(id))) {
                     if (!itemRowsMap.get(String.valueOf(id)).isEmpty()) {
-                        if (itemRowsMap.get(String.valueOf(id)).get(0).getBoolean("isonsale")) {
-                            return getErrReturnObject().setErrMsg("上架状态无法反审核").toString();
+                        if (itemRowsMap.get(String.valueOf(id)).get(0).getBoolean("isonsale") || itemRowsMap.get(String.valueOf(id)).get(0).getBoolean("isused") ) {
+                            return getErrReturnObject().setErrMsg("上架或启用状态无法反审核").toString();
                         }
                     }
 
@@ -843,8 +843,70 @@ public class Item extends Controller {
         return getSucReturnObject().toString();
     }
 
+    @API(title = "货品档案启用", apiversion = R.ID2025070114584703.v1.class)
+    @CACHEING_CLEAN(apiClass = {Item.class,itemgroup.class, restcontroller.sale.itemgroup.itemgroup.class})
+    public String used() throws YosException {
+        JSONArray jsonArray = content.getJSONArray("itemids");
+        String isused = content.getString("isused");
+        if (jsonArray.size() == 0) {
+            return getErrReturnObject().setErrMsg("未选择商品").toString();
+        }
+
+        if (isused.equals("1")) {
+
+            SQLFactory isHas = new SQLFactory(this, "查询是否存在新建货品");
+            isHas.addParameter_in("itemid", jsonArray.toArray());
+            isHas.addParameter("siteid", siteid);
+            Rows hasRows = dbConnect.runSqlQuery(isHas.getSQL());
+
+            SQLFactory isHasOnSale = new SQLFactory(this, "查询是否存在启用货品");
+            isHasOnSale.addParameter_in("itemid", jsonArray.toArray());
+            isHasOnSale.addParameter_in("isused", 1);
+            isHasOnSale.addParameter("siteid", siteid);
+            Rows hasOnSaleRows = dbConnect.runSqlQuery(isHasOnSale.getSQL());
+            if (hasRows.isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("存在未审核的货品，无法启用！").toString();
+            }
+            if (hasOnSaleRows.isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("存在已启用的货品，无法启用！").toString();
+            }
+            //System.out.println("select * from sa_itemsaleclass where siteid='" + siteid + "' and itemid in " + jsonArray.toArray());
+            String sql = "select * from sa_itemsaleclass where siteid='" + siteid + "' and itemid in " + jsonArray.toJSONString();
+            sql = sql.replace("[", "(").replace("]", ")");
+            Rows itemsaleclassRows = dbConnect.runSqlQuery(sql);
+
+            if (itemsaleclassRows.isEmpty()) {
+                return getErrReturnObject().setErrMsg("商品未维护营销类别，无法启用！").toString();
+            }
+
+            SQLFactory isHasPrice = new SQLFactory(this, "查询是否存在未维护价格的商品");
+            isHasPrice.addParameter_in("itemid", jsonArray.toArray());
+            isHasPrice.addParameter("siteid", siteid);
+            Rows hasPriceRows = dbConnect.runSqlQuery(isHasPrice.getSQL());
+            if (hasPriceRows.isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("存在未维护价格的货品，无法启用！").toString();
+            }
+        }
+        ArrayList<String> sqlList = new ArrayList<>();
+        for (Object obj : jsonArray) {
+            Long id = Long.valueOf(obj.toString());
+            SQLFactory sqlFactory = new SQLFactory(this, "货品档案启用");
+            sqlFactory.addParameter("itemid", id);
+            sqlFactory.addParameter("siteid", siteid);
+            sqlFactory.addParameter("isused", isused);
+            sqlList.add(sqlFactory.getSQL());
+            if (isused.equals("1")) {
+                sqlList.add(DataContrlLog.createLog(this, "plm_item", id, "启用", "启用成功").getSQL());
+            } else {
+                sqlList.add(DataContrlLog.createLog(this, "plm_item", id, "停用", "停用成功").getSQL());
+            }
+    }
+        return getSucReturnObject().toString();
+    }
+
+
     @API(title = "货品档案上架", apiversion = R.ID20220923154802.v1.class)
-    @CACHEING_CLEAN(apiversions = {R.ID20220923140602.v1.class}, apiClass = {itemgroup.class, restcontroller.sale.itemgroup.itemgroup.class})
+    @CACHEING_CLEAN(apiClass = {Item.class,itemgroup.class, restcontroller.sale.itemgroup.itemgroup.class})
     public String onsale() throws YosException {
 
         JSONArray jsonArray = content.getJSONArray("itemids");
@@ -860,6 +922,12 @@ public class Item extends Controller {
             isHas.addParameter("siteid", siteid);
             Rows hasRows = dbConnect.runSqlQuery(isHas.getSQL());
 
+            SQLFactory isHasIsused = new SQLFactory(this, "查询是否存在启用货品");
+            isHasIsused.addParameter_in("itemid", jsonArray.toArray());
+            isHasIsused.addParameter_in("isused", 0);
+            isHasIsused.addParameter("siteid", siteid);
+            Rows hasIsusedRows = dbConnect.runSqlQuery(isHasIsused.getSQL());
+
             SQLFactory isHasOnSale = new SQLFactory(this, "查询是否存在上架货品");
             isHasOnSale.addParameter_in("itemid", jsonArray.toArray());
             isHasOnSale.addParameter("siteid", siteid);
@@ -867,6 +935,9 @@ public class Item extends Controller {
             if (hasRows.isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("存在未审核的货品，无法上架！").toString();
             }
+            if (hasIsusedRows.isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("存在未启用的货品，无法上架！").toString();
+            }
             if (hasOnSaleRows.isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("存在已上架的货品，无法上架！").toString();
             }

src/custom/restcontroller/webmanage/sale/item/SQL/查询是否存在启用货品.sql

@@ -0,0 +1,5 @@
+SELECT 1
+FROM plm_item
+WHERE itemid IN $itemid$
+  AND `isused` = $isused$
+  and siteid = $siteid$

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案启用.sql

@@ -0,0 +1,6 @@
+UPDATE plm_item
+SET `isused`=$isused$
+WHERE itemid = $itemid$
+  and siteid = $siteid$
+  and status = '审核'
+

src/custom/restcontroller/webmanage/sale/order/SQL/商品等级价格查询.sql

@@ -3,5 +3,5 @@ from sa_itemprice t1
          inner join sa_itemprice_grademapping t2 on t1.siteid = t2.siteid and t1.pricegrade = t2.pricegrade
          inner join sys_enterprise t3 on t2.siteid = t3.siteid and t2.grade = t3.grade
 where t1.siteid = $siteid$
-  and t1.itemid in $itemid$
+  and t1.itemid = $itemid$
   and t3.sys_enterpriseid = $sys_enterpriseid$