Browse Source

商品档案增加已售数量及别名

hu 9 months ago
parent
commit
14c1d4fc61

+ 1 - 0
src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -116,6 +116,7 @@ public class itemgroup extends Controller {
                         + whereObject.getString("condition") + "%' or s2.itemno like '%" + whereObject.getString("condition")
                         + "%' or s2.standards like '%" + whereObject.getString("condition")
                         + "%' or s2.spec like '%" + whereObject.getString("condition")
+                        + "%' or s2.byname like '%" + whereObject.getString("condition")
                         + "%' or s2.model like '%" + whereObject.getString("condition")
                         + "%') and s1.sa_itemgroupid=t1.sa_itemgroupid) ) ";
             }

+ 9 - 0
src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -466,6 +466,15 @@ public class aftersalesmag extends Controller {
         }
 
         ArrayList<String> sqlList = new ArrayList<>();
+        Rows sa_aftersalesmag_itemsByOrderRows = dbConnect.runSqlQuery("select sum(t1.qty) qty,t1.itemid from sa_aftersalesmag_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_aftersalesmagid=" + sa_aftersalesmagid +" group by t1.itemid");
+        for (Row row : sa_aftersalesmag_itemsByOrderRows) {
+            BigDecimal qty = row.getBigDecimal("qty");
+            if (rows.get(0).getString("type").equals("退货单")) {
+                sqlList.add("update plm_item set saleqty=if((saleqty-"+qty+")>0,saleqty-"+qty+",0)  where itemid=" + row.getLong("itemid"));
+            }
+        }
+
+
         Rows sa_aftersalesmag_itemsRows = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t2.itemno,t2.itemname,t2.skucontrol from sa_aftersalesmag_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_aftersalesmagid=" + sa_aftersalesmagid);
         for (Row row : sa_aftersalesmag_itemsRows) {
             BigDecimal returnqty = row.getBigDecimal("qty");

+ 3 - 0
src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -199,6 +199,9 @@ public class Item extends Controller {
         sqlFactory.addParameter("cost", content.getBigDecimalValue("cost"));
         sqlFactory.addParameter("grossprofit", content.getBigDecimalValue("grossprofit"));
         sqlFactory.addParameter("grossprofitmargin", content.getBigDecimalValue("grossprofitmargin"));
+        sqlFactory.addParameter("soldbase", content.getBigDecimalValue("soldbase"));
+        sqlFactory.addParameter("byname", content.getStringValue("byname"));
+
         sqlList.add(sqlFactory.getSQL());
         // 货品档案扩展属性字段表
 

+ 3 - 0
src/custom/restcontroller/webmanage/sale/item/SQL/货品档案列表.sql

@@ -38,6 +38,9 @@ SELECT t1.itemid,
        t1.customprice,
        t1.pricingmetod,
        t1.saleprice,
+       t1.soldbase,
+       t1.saleqty,
+       t1.byname,
        t1.cost,
        t1.grossprofit,
        t1.grossprofitmargin,

+ 3 - 1
src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -53,7 +53,9 @@ SET changeuserid=$userid$,
     cost=$cost$,
     grossprofit=$grossprofit$,
     saleprice=$saleprice$,
-    grossprofitmargin=$grossprofitmargin$
+    grossprofitmargin=$grossprofitmargin$,
+    soldbase=$soldbase$,
+    byname=$byname$
 WHERE itemid = $itemid$
   and siteid = $siteid$
 

+ 21 - 0
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1592,6 +1592,12 @@ public class Order extends Controller {
         }
         ArrayList<String> sqlList = new ArrayList<>();
         String sonum = row.getString("sonum");
+
+        Rows orderdetails_items = dbConnect.runSqlQuery("select itemid,sum(qty) qty from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by itemid");
+        for (Row orderdetail : orderdetails_items) {
+            sqlList.add("update plm_item set saleqty=ifnull(saleqty,0)+" + orderdetail.getBigDecimal("qty") + " where itemid=" + orderdetail.getLong("itemid"));
+        }
+
         if (type.equals("促销订单")) {
             Rows orderdetails = dbConnect.runSqlQuery("select sa_promotion_itemsid,itemno,sum(qty) qty  from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by sa_promotion_itemsid,itemno");
             Rows promotionitems = dbConnect.runSqlQuery("select * from sa_promotion_items where siteid='" + siteid + "' and sa_promotionid=" + row.getLong("sa_promotionid"));
@@ -2253,6 +2259,11 @@ public class Order extends Controller {
         BigDecimal amount = beans.order.Order.getAmount(this, sa_orderid);
         ArrayList<String> sqlList = new ArrayList<>();
 
+        Rows orderdetails_items = dbConnect.runSqlQuery("select itemid,sum(qty) qty from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by itemid");
+        for (Row orderdetail : orderdetails_items) {
+            sqlList.add("update plm_item set saleqty=saleqty-" + orderdetail.getBigDecimal("qty") + " where itemid=" + orderdetail.getLong("itemid"));
+        }
+
         String type = row.getString("type");
         if (type.equals("促销订单")) {
             Rows orderdetails = dbConnect.runSqlQuery("select sa_promotion_itemsid,itemno,sum(qty) qty  from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by sa_promotion_itemsid,itemno");
@@ -2366,6 +2377,11 @@ public class Order extends Controller {
         BigDecimal amount = beans.order.Order.getAmount(this, sa_orderid);
         ArrayList<String> sqlList = new ArrayList<>();
 
+        Rows orderdetails_items = dbConnect.runSqlQuery("select itemid,sum(qty) qty from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by itemid");
+        for (Row orderdetail : orderdetails_items) {
+            sqlList.add("update plm_item set saleqty=saleqty-" + orderdetail.getBigDecimal("qty") + " where itemid=" + orderdetail.getLong("itemid"));
+        }
+
         String type = row.getString("type");
         if (type.equals("促销订单")) {
             Rows orderdetails = dbConnect.runSqlQuery("select sa_promotion_itemsid,itemno,sum(qty) qty  from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by sa_promotion_itemsid,itemno");
@@ -3499,6 +3515,11 @@ public class Order extends Controller {
         sqlList.add("UPDATE sa_order SET STATUS='手工关闭',closedate=current_time,closeby='" + username + "' WHERE sa_orderid='" + sa_orderid + "' and siteid = '" + siteid + "'");
         sqlList.add("UPDATE sa_orderitems SET isclose=1 WHERE sa_orderid='" + sa_orderid + "' and siteid = '" + siteid + "'");
 
+        Rows orderdetails_items = dbConnect.runSqlQuery("select itemid,sum(undeliqty) qty from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by itemid");
+        for (Row orderdetail : orderdetails_items) {
+            sqlList.add("update plm_item set saleqty=saleqty-" + orderdetail.getBigDecimal("qty") + " where itemid=" + orderdetail.getLong("itemid"));
+        }
+
         String type = orderRow.get(0).getString("type");
         if (type.equals("促销订单")) {
             Rows orderdetails = dbConnect.runSqlQuery("select sa_promotion_itemsid,itemno,sum(undeliqty) qty  from sa_orderitems where siteid='" + siteid + "' and sa_orderid=" + sa_orderid + " group by sa_promotion_itemsid,itemno");