diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml index cb614be..15fa211 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml @@ -25,7 +25,7 @@ 已售：{{sele_g.sales_sum}} - + 可售：{{def_pick_store.CanOutQty}} 可售:0 diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index c27de39..bd29916 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -444,7 +444,9 @@ Page({ store_config: e, sys_switch: json_d, is_closecoupon: json_d.is_closecoupon, - is_newsales_rules: json_d.is_newsales_rules + is_newsales_rules: json_d.is_newsales_rules, + appoint_pick_keyid: json_d.appoint_pick_keyid + }); ee.init(gid); //------几人评价------- @@ -586,31 +588,45 @@ Page({ var that = this, th = this; getApp().getConfig2(function (e) { var sales_rules = e.sales_rules; - if (sales_rules == 2) { + if (sales_rules >= 2) { getApp().waitfor2(that, "wait_for_user_store", "fir_goods", function () { var lock = 0, plist = null; var gd = that.data.fir_goods; //先读取门店的lock,采用链式写法，少用await - getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: that.data.fir_goods.goods_id, storageId: ee.pickup_id, pageSize: 1000 } - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - for (var i in res.data.data.pageData) - lock += res.data.data.pageData[i].outQty - } - //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { storageNos: ee.pickup_no, wareIds: encodeURIComponent(th.data.data.erpwareid), storeId: os.stoid } - }) - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - plist = res.data.data.pageData[0]; - } - if (plist && plist.CanOutQty - lock > 0) { - ee.CanOutQty = plist.CanOutQty - lock; - } else { - ee.CanOutQty = 0; - } + + // getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + // data: { store_id: os.stoid, wareId: that.data.fir_goods.goods_id, storageId: ee.pickup_id, pageSize: 1000 } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // for (var i in res.data.data.pageData) + // lock += res.data.data.pageData[i].outQty + // } + // //---通过接口获取门店的线下库存信息-- + // return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + // data: { storageNos: ee.pickup_no, wareIds: encodeURIComponent(th.data.data.erpwareid), storeId: os.stoid } + // }) + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // plist = res.data.data.pageData[0]; + // } + // if (plist && plist.CanOutQty - lock > 0) { + // ee.CanOutQty = plist.CanOutQty - lock; + // } else { + // ee.CanOutQty = 0; + // } + // //--给门店赋值线下库存-- + // that.data.fir_def_store = ee; + // that.setData({ + // def_pick_store: ee, + // sto_sele_name: ee.pickup_name, + // sto_sele_id: ee.pickup_id, + // sto_sele_distr: ee.distr_type + // }) + // }) + + //最新的获取线下门店库存 + th.check_CanOutQty(gd, ee, function (CanOutQty) { + ee.CanOutQty = CanOutQty; //--给门店赋值线下库存-- that.data.fir_def_store = ee; that.setData({ @@ -620,6 +636,8 @@ Page({ sto_sele_distr: ee.distr_type }) }) + + }) } else { that.data.fir_def_store = ee; @@ -1575,45 +1593,68 @@ Page({ return false; } else { //---如果是线下门店销售的时候--- - if (th.data.sales_rules == 2) { + if (th.data.sales_rules >= 2) { var pick = th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- - getApp().request.get("/api/weshop/goods/getWareStorages", { - data: { storageNos: pick.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid }, - success: function (res) { - if (res.data.code == 0) { - if (res.data.data.pageData.length > 0) { - var CanOutQty = res.data.data.pageData[0].CanOutQty; - if (CanOutQty < e.data.goodsInputNum) { - return s.my_warnning("库存不足！", 0, th); - } - //在调一次接口,读取商品的预出库的数量，lock - getApp().request.get("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 }, - success: function (res_data) { - if (res_data.data.code == 0 && res_data.data.data.total > 0) { - - var lock = 0; - for (var i in res_data.data.data.pageData) { - lock += res_data.data.data.pageData[i].outQty; - } - - if (CanOutQty <= lock) { - return s.my_warnning("库存不足！", 0, th); - } - th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); - } else { - th.add_cart_next(e, t, a, o, newd, CanOutQty); - } - } - }) - } else { - return s.my_warnning("库存不足！", 0, th); - } - + // getApp().request.get("/api/weshop/goods/getWareStorages", { + // data: { storageNos: pick.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid }, + // success: function (res) { + // if (res.data.code == 0) { + // if (res.data.data.pageData.length > 0) { + // var CanOutQty = res.data.data.pageData[0].CanOutQty; + // if (CanOutQty < e.data.goodsInputNum) { + // return s.my_warnning("库存不足！", 0, th); + // } + // //在调一次接口,读取商品的预出库的数量，lock + // getApp().request.get("/api/weshop/order/ware/lock/page", { + // data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 }, + // success: function (res_data) { + // if (res_data.data.code == 0 && res_data.data.data.total > 0) { + // + // var lock = 0; + // for (var i in res_data.data.data.pageData) { + // lock += res_data.data.data.pageData[i].outQty; + // } + // + // if (CanOutQty <= lock) { + // return s.my_warnning("库存不足！", 0, th); + // } + // th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); + // } else { + // th.add_cart_next(e, t, a, o, newd, CanOutQty); + // } + // } + // }) + // } else { + // return s.my_warnning("库存不足！", 0, th); + // } + // + // } + // } + // }) + + th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) { + if (CanOutQty) { + if (CanOutQty < e.data.goodsInputNum) { + wx.showToast({ + title: '库存不足！', + icon: 'none', + }); + return false; } + + th.add_cart_next(e, t, a, o, newd, CanOutQty); + } else { + wx.showToast({ + title: '库存不足！', + icon: 'none', + }); + return false; } }) + + + } else { if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); @@ -1628,45 +1669,69 @@ Page({ newd.prom_id = 0; //---如果是线下门店销售的时候--- - if (th.data.sales_rules == 2) { + if (th.data.sales_rules >= 2) { var pick = th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- - getApp().request.get("/api/weshop/goods/getWareStorages", { - data: { storageNos: pick.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid }, - success: function (res) { - if (res.data.code == 0) { - if (res.data.data.pageData.length > 0) { - var CanOutQty = res.data.data.pageData[0].CanOutQty; - if (CanOutQty < e.data.goodsInputNum) { - return s.my_warnning("库存不足！", 0, th); - } - //在调一次接口,读取商品的预出库的数量，lock - getApp().request.get("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 }, - success: function (res_data) { - if (res_data.data.code == 0 && res_data.data.data.total > 0) { - - var lock = 0; - for (var i in res_data.data.data.pageData) { - lock += res_data.data.data.pageData[i].outQty; - } - - if (CanOutQty <= lock) { - return s.my_warnning("库存不足！", 0, th); - } - th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); - } else { - th.add_cart_next(e, t, a, o, newd, CanOutQty); - } - } - }) - } else { - return s.my_warnning("库存不足！", 0, th); - } + // getApp().request.get("/api/weshop/goods/getWareStorages", { + // data: { storageNos: pick.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid }, + // success: function (res) { + // if (res.data.code == 0) { + // if (res.data.data.pageData.length > 0) { + // var CanOutQty = res.data.data.pageData[0].CanOutQty; + // if (CanOutQty < e.data.goodsInputNum) { + // return s.my_warnning("库存不足！", 0, th); + // } + // //在调一次接口,读取商品的预出库的数量，lock + // getApp().request.get("/api/weshop/order/ware/lock/page", { + // data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 }, + // success: function (res_data) { + // if (res_data.data.code == 0 && res_data.data.data.total > 0) { + // + // var lock = 0; + // for (var i in res_data.data.data.pageData) { + // lock += res_data.data.data.pageData[i].outQty; + // } + // + // if (CanOutQty <= lock) { + // return s.my_warnning("库存不足！", 0, th); + // } + // th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); + // } else { + // th.add_cart_next(e, t, a, o, newd, CanOutQty); + // } + // } + // }) + // } else { + // return s.my_warnning("库存不足！", 0, th); + // } + // + // } + // } + // }) + + + th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) { + if (CanOutQty) { + if (CanOutQty < e.data.goodsInputNum) { + wx.showToast({ + title: '库存不足！', + icon: 'none', + }); + return false; } + + th.add_cart_next(e, t, a, o, newd, CanOutQty); + } else { + wx.showToast({ + title: '库存不足！', + icon: 'none', + }); + return false; } }) + + } else { if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); @@ -1981,7 +2046,7 @@ Page({ } var e = th.data.sele_g.store_count; var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 - if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { + if (th.data.sales_rules >= 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { if (!th.data.def_pick_store) { wx.showModal({ title: '请选择门店', }); return false; @@ -2062,7 +2127,7 @@ Page({ var e = th.data.sele_g.store_count; var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 - if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { + if (th.data.sales_rules >= 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { if (!th.data.def_pick_store) { wx.showModal({ title: '请选择门店', }); return false; @@ -2687,32 +2752,41 @@ Page({ //默认门店要拿下门店库存 - if (that.data.sales_rules == 2 && that.data.def_pick_store) { + if (that.data.sales_rules >= 2 && that.data.def_pick_store) { var lock = 0, plist = null; - //先读取门店的lock,采用链式写法，少用await - getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: ee.data.sele_g.goods_id, storageId: that.data.def_pick_store.pickup_id, pageSize: 1000 } - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - for (var i in res.data.data.pageData) - lock += res.data.data.pageData[i].outQty - } - //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { storageNos: that.data.def_pick_store.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid } - }) - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - plist = res.data.data.pageData[0]; - } - if (plist && plist.CanOutQty - lock > 0) { - that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock; - } else { - that.data.def_pick_store.CanOutQty = 0; - } + // //先读取门店的lock,采用链式写法，少用await + // getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + // data: { store_id: os.stoid, wareId: ee.data.sele_g.goods_id, storageId: that.data.def_pick_store.pickup_id, pageSize: 1000 } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // for (var i in res.data.data.pageData) + // lock += res.data.data.pageData[i].outQty + // } + // //---通过接口获取门店的线下库存信息-- + // return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + // data: { storageNos: that.data.def_pick_store.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid } + // }) + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // plist = res.data.data.pageData[0]; + // } + // if (plist && plist.CanOutQty - lock > 0) { + // that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock; + // } else { + // that.data.def_pick_store.CanOutQty = 0; + // } + // //--给门店赋值线下库存-- + // th.setData({ def_pick_store: that.data.def_pick_store }); + // }) + + that.check_CanOutQty(that.data.sele_g, that.data.def_pick_store, function (CanOutQty) { + that.data.def_pick_store.CanOutQty = CanOutQty; //--给门店赋值线下库存-- - th.setData({ def_pick_store: that.data.def_pick_store }); + that.setData({ + def_pick_store: that.data.def_pick_store + }); }) + } @@ -2908,7 +2982,7 @@ Page({ th.setData({ all_pick_list: e.data.data.pageData }); //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购-- - if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { + if (th.data.sales_rules >= 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { setTimeout(function () { th.deal_pickup_dline(e); }, 800) @@ -3108,16 +3182,42 @@ Page({ var g_distr_type = th.data.sele_g.distr_type; var lock = []; + + + + var lock_rq = { + store_id: os.stoid, + wareId: th.data.sele_g.goods_id, + pageSize: 1000 + }; + + if (th.data.sales_rules == 3) { + lock_rq.appoint_pick_keyid = th.data.appoint_pick_keyid; + } + //先读取门店的lock,采用链式写法，少用await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, pageSize: 1000 } + data: lock_rq }).then(res => { if (res.data.code == 0 && res.data.data.total > 0) { lock = res.data.data.pageData } + + var sto_rq = { + wareIds: encodeURIComponent(th.data.sele_g.erpwareid), + storeId: os.stoid, + pageSize: 2000 + } + + if (th.data.sales_rules == 3) { + sto_rq.storageIds = th.data.appoint_pick_keyid; + } else { + sto_rq.storageNos = pkno_str; + } + //---通过接口获取门店的线下库存信息-- return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { storageNos: pkno_str, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid, pageSize: 2000 } + data: sto_rq }) }).then(res => { @@ -3126,28 +3226,64 @@ Page({ if (res.data.data.pageData && res.data.data.pageData.length > 0) { var plist = res.data.data.pageData; var def_pick_store = th.data.def_pick_store; - //以原来的数组为外循环，保证距离的顺序 - for (var kk in o_plist) { - for (var ii in plist) { - //线下的门店小心 - var n_item = plist[ii]; - if (n_item.StorageNo == o_plist[kk].pickup_no) { - - //拿到锁库的数量 - var lock_num = th.find_lock_num(o_plist[kk].pickup_id, lock); - //可出库数大于预出库库存的数量，可以判断为有库存 - if (n_item.CanOutQty > lock_num) { - o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num; - new_list.push(o_plist[kk]); - //--如果找到默认门店,同时也应该判断配送方式对不对-- - if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { - th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num; - if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id) - th.setData({ def_pick_store: th.data.fir_def_store }) - is_find_def_store = 1; + + if (th.data.sales_rules == 3) { + var lock_num = 0; + var Qty = 0; + //-- 计算锁住的库存 -- + for (var i in lock) lock_num += lock[i].outQty; + Qty = plist[0].CanOutQty - lock_num; + + if (Qty > 0) { + for (var kk in o_plist) { + o_plist[kk].CanOutQty = Qty; + new_list.push(o_plist[kk]); + } + if (th.data.fir_def_store && + (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || (th.data.def_pick_store && th.data.def_pick_store.distr_type == g_distr_type))) { + th.data.fir_def_store.Qty; + if (def_pick_store && def_pick_store.pickup_id == th.data.fir_def_store.pickup_id) + th.setData({ + def_pick_store: th.data.fir_def_store + }) + is_find_def_store = 1; + } + + } else { + th.setData({ + all_sto: null, + only_pk: null, + def_pickpu_list: null + }); + return false; + } + + } else { + + + //以原来的数组为外循环，保证距离的顺序 + for (var kk in o_plist) { + for (var ii in plist) { + //线下的门店小心 + var n_item = plist[ii]; + if (n_item.StorageNo == o_plist[kk].pickup_no) { + + //拿到锁库的数量 + var lock_num = th.find_lock_num(o_plist[kk].pickup_id, lock); + //可出库数大于预出库库存的数量，可以判断为有库存 + if (n_item.CanOutQty > lock_num) { + o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num; + new_list.push(o_plist[kk]); + //--如果找到默认门店,同时也应该判断配送方式对不对-- + if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { + th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num; + if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id) + th.setData({def_pick_store: th.data.fir_def_store}) + is_find_def_store = 1; + } } + break; } - break; } } } @@ -5698,34 +5834,48 @@ Page({ func(); return false; } - if (this.data.sales_rules != 2) { + if (this.data.sales_rules < 2) { func(); } else { //先读取门店的lock - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { - data: { store_id: os.stoid, wareId: goodsinfo.goods_id, storageId: item.pickup_id, pageSize: 1000 } - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - for (var i in res.data.data.pageData) - lock += res.data.data.pageData[i].outQty; - } - }) - //读取线下的门店库存 - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { - data: { storageNos: item.pickup_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid } - }).then(res => { - if (res.data.code == 0 && res.data.data.total > 0) { - plist = res.data.data.pageData[0]; - } - }) + // await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + // data: { store_id: os.stoid, wareId: goodsinfo.goods_id, storageId: item.pickup_id, pageSize: 1000 } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // for (var i in res.data.data.pageData) + // lock += res.data.data.pageData[i].outQty; + // } + // }) + // //读取线下的门店库存 + // await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + // data: { storageNos: item.pickup_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.total > 0) { + // plist = res.data.data.pageData[0]; + // } + // }) + // + // if (plist && plist.CanOutQty - lock > 0) { + // item.CanOutQty = plist.CanOutQty - lock; + // func(); + // return false; + // } + // getApp().my_warnning(item.pickup_name + "库存不足！", 0, th); - if (plist && plist.CanOutQty - lock > 0) { - item.CanOutQty = plist.CanOutQty - lock; + this.check_CanOutQty(goodsinfo, item, function (CanOutQty) { + // let str = item.pickup_name + '库存不足！'; + if (!CanOutQty) { + wx.showToast({ + title: item.pickup_name + '库存不足！', + icon: 'none', + }); + return false; + } + item.CanOutQty = CanOutQty; func(); - return false; - } - getApp().my_warnning(item.pickup_name + "库存不足！", 0, th); + + }); } }, @@ -6656,5 +6806,65 @@ Page({ }); }, + //统一一下获取线下库存的函数 + async check_CanOutQty(goodsinfo, item, func) { + + var sales_rules = this.data.sales_rules; + + var lock_rq = { + store_id: os.stoid, + wareId: goodsinfo.goods_id, + pageSize: 1000 + }; + + if (sales_rules == 2) { + lock_rq.storageId = item.pickup_id + } else { + lock_rq.appoint_pick_keyid = encodeURIComponent(this.data.appoint_pick_keyid) + } + + var lock = 0; + var CanOutQty = 0; + var plist = null; + //先读取门店的lock + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + data: lock_rq + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + for (var i in res.data.data.pageData) + lock += res.data.data.pageData[i].outQty; + } + }) + + var sto_req = { + wareIds: encodeURIComponent(goodsinfo.erpwareid), + storeId: os.stoid + } + if (sales_rules == 2) { + sto_req.storageNos = item.pickup_no + } else { + sto_req.storageIds = encodeURIComponent(this.data.appoint_pick_keyid) + } + + + + //读取线下的门店库存 + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + data: sto_req + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + plist = res.data.data.pageData[0]; + } + }) + + if (plist && plist.CanOutQty - lock > 0) { + CanOutQty = plist.CanOutQty - lock; + } + + if (func) func(CanOutQty); + + }, + + }); diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index aeca89a..007e47b 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -426,7 +426,7 @@ (配送不匹配) - + (库存不足) @@ -1081,7 +1081,7 @@ 已售：{{sele_g.sales_sum}} - + 可售：{{def_pick_store.CanOutQty}} @@ -1122,7 +1122,7 @@ (库存不足) (配送不匹配) - + (库存不足) @@ -1194,7 +1194,7 @@ - + 库存不足 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 1e399bd..48ec1cf 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -3063,7 +3063,7 @@ Page({ //默认门店要拿下门店库存 if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id) { - var lock = 0, + var lock = 0, plist = null; //先读取门店的lock,采用链式写法，少用await // getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 7ee4a77..d6bfd10 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -975,6 +975,7 @@ Page({ sto_rq.storageIds=this.data.appoint_pick_keyid; delete sto_rq.storageNos } + //读取线下的门店库存 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ @@ -1115,6 +1116,7 @@ Page({ } var prom=null; + let user_id = getApp().globalData.userInfo.user_id; b_item.goods_id=g_item.goods_id; b_item.goods_name=g_item.goods_name; @@ -1210,7 +1212,7 @@ Page({ }) break; case 10: - let user_id = getApp().globalData.userInfo.user_id; + var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; await getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.isuse && res.data.data.is_end == 0) { @@ -1314,6 +1316,8 @@ Page({ delete sto_rq.storageNos; } + + //---通过接口获取门店的线下库存信息-- await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { data: sto_rq