diff --git a/api/user.js b/api/user.js index bf09c55..9ec28de 100644 --- a/api/user.js +++ b/api/user.js @@ -1361,4 +1361,17 @@ export function distributionTrayDetail(data) { method: "get", data }); +} + +/** + * 异常装车 + * @param {Object} data + */ +export function postAbnormalTruckLoading(data) { + + return request({ + url: `logpm-distribution/app/delivery/abnormalLoading`, + method: "post", + data + }); } \ No newline at end of file diff --git a/config/host.js b/config/host.js index 2657bea..0d5eab0 100644 --- a/config/host.js +++ b/config/host.js @@ -10,9 +10,9 @@ // zhy // const devhost='http://192.168.10.48:8888/' // tjj -const devhost='http://192.168.10.29:13000/' +// const devhost='http://192.168.10.29:13000/' // cyz -// const devhost='http://192.168.10.75:8777/' +const devhost='http://192.168.10.75:8777/' // cg // const devhost='http://192.168.10.200:8888/' /** diff --git a/interfaces/pagesHome/StockUplist.ts b/interfaces/pagesHome/StockUplist.ts index ae50748..e234997 100644 --- a/interfaces/pagesHome/StockUplist.ts +++ b/interfaces/pagesHome/StockUplist.ts @@ -43,5 +43,14 @@ export interface detailType{ /** * 上个列表的数据 * */ - items:any + items:any, + /** + * 是否扫码 + */ + isscan: Boolean, + /** + * 扫码出的值 + */ + scancode: string, + trayId: string } \ No newline at end of file diff --git a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue index 2c82adf..9d08086 100644 --- a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue +++ b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue @@ -89,6 +89,18 @@ + + + + + 是否进行异常装车 + + + + + + + @@ -98,7 +110,8 @@ deliveryorder, signforinventory, deliveryloadingscan, - deliveryloadinginventory + deliveryloadinginventory, + postAbnormalTruckLoading } from '@/api/user.js' import { onLoad, @@ -109,6 +122,7 @@ import cusSelects from '@/compoment/cus-selects-fan/cus-selects-fan.vue' import { computed, inject, reactive, ref, toRefs, watchEffect } from "vue"; const utils = inject('utils') as any + const showPopup = ref(false) let details = reactive({ schanvalue: '', typearr: [ @@ -229,15 +243,28 @@ * */ async function scandata() { let loadingId = uni.getStorageSync('checkvehicle').id + // 定制品 if (details.orderStatus == 1) { let data = { + reservationId: details.items.id, deliveryId: details.id, loadingId, type: 1, barcode: details.scancode } + data.barcode = 'P00752306060908726' let res = await deliveryloadingscan(data) console.log(res); + const {code, audio} = res + // 异常装车 + if (code === 5000){ + utils.ttsspke(audio) + // 开启弹出层 + showPopup.value = true + } + // 窜货 + if (code === 3001) utils.ttsspke(audio) + // 库存品 } else if (details.orderStatus == 2) { let data = { reservationId: details.items.id, @@ -251,6 +278,7 @@ } initpage() } + function checkphon(index : number) { // details.listcheckindex=index if (details.listcheckindex == index) { @@ -259,6 +287,34 @@ details.listcheckindex = index } } + + /** + * 异常装车 + */ + function abnormalTruckLoading(){ + let loadingId = uni.getStorageSync('checkvehicle').id + + let data = { + reservationId: details.items.id, + deliveryId: details.id, + loadingId, + type: 1, + barcode: details.scancode + } + data.barcode = 'P00842306030843402' + // 提价异常装车请求 + postAbnormalTruckLoading(data) + // 关闭弹出层 + showPopup.value = false + } + + /** + * 关闭弹出窗 + */ + function close() { + showPopup.value = false + } + const { listcheckindex, inputtxt, orderStatus, schanvalue, typearr, items, datalist } = toRefs(details) diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue index 1acd2cc..6c89205 100644 --- a/pagesHome/pages/CustomerSign/CustomerSign.vue +++ b/pagesHome/pages/CustomerSign/CustomerSign.vue @@ -154,7 +154,6 @@ async function uplodimg(item){ let data={ reservationId:item.id, - } let res=await signforprices(data) let imglis=[],rearks='' diff --git a/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue b/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue index 1c393f0..add25b6 100644 --- a/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue +++ b/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue @@ -29,7 +29,6 @@ {{loadingNub}} - @@ -77,7 +76,7 @@ signforinventory, deliveryloadingscan, deliveryloadinginventory, - distributionTrayDetail + distributionTrayDetail, } from '@/api/user.js' import { onLoad, @@ -222,14 +221,16 @@ // reservationId: '1707271276416094210', // deliveryId: '1707271279670874114', loadingId, - type: 1, + type: 2, barcode: details.scancode } - data.barcode = details.datalist[0].trayCode + data.barcode = 'HTLQ000019' let res = await deliveryloadingscan(data) console.log('res', res); - + const {code} = res + // 语音播报 + if (code === 3001 || code === 200) utils.ttsspke(res.audio) initpage() } function checkphon(index : number) { @@ -241,9 +242,6 @@ } } - function submitEvent(){ - scandata() - } const { listcheckindex, inputtxt, orderStatus, schanvalue, typearr, items, datalist } = toRefs(details) diff --git a/pagesHome/pages/StockUplist/StockUplist.vue b/pagesHome/pages/StockUplist/StockUplist.vue index 77bd49e..1a79acf 100644 --- a/pagesHome/pages/StockUplist/StockUplist.vue +++ b/pagesHome/pages/StockUplist/StockUplist.vue @@ -108,7 +108,8 @@ distributionStockupscanningCode, distributionStockuplocationSelection } from '@/api/user.js' - import { reactive, toRefs,ref } from "vue"; + import { reactive, toRefs,ref,inject } from "vue"; + const utils = inject('utils') as any const tiplists=ref(null) let details=reactive({ reservationId:'', @@ -122,7 +123,10 @@ }, stockList:[], stockupId:'', - items:{} + items:{}, + isscan: false, + scancode: '', + trayId: '' }) onLoad((op)=>{ details.reservationId=op.id @@ -131,14 +135,26 @@ // details.user.goodsAreaName=op.stockupArea // details.reservationId='1682676882390781953' }) - onShow(()=>{ + onShow(() => { + uni.$on('scancodedate', function (code) { + if (code) { + console.log(code); + details.scancode = code + details.isscan = true + if (details.isscan) scandata() + } + }) initpage() }) - function goorderdetail(item){ - uni.navigateTo({ - url:'/pagesHome/pages/orderDetails/orderDetails?orderCode='+item.orderCode - }) - } + onHide(() => { + uni.$off('scancodedate') + details.isscan = false + }) + function goorderdetail(item){ + uni.navigateTo({ + url:'/pagesHome/pages/orderDetails/orderDetails?orderCode='+item.orderCode + }) + } async function initpage(){ console.log(details.items); let data={ @@ -149,13 +165,13 @@ } details.orderList=[] let response=await distributionStockuporderList(data) - console.log(response); details.user.consignee=response.data?.consignee details.user.goodsAreaName=response.data?.goodsAreaName details.user.planNum=response.data?.planNum details.user.scanNum=response.data?.scanNum details.orderList=response.data?.orderList details.stockList=response.data?.stockList + details.isscan = false } function godetails(item:any){ uni.navigateTo({ @@ -170,13 +186,15 @@ }) } - async function ckscanningCode(item){ - let data={ - stockupId:details.stockupId, - trayId:item.trayId, - reservationId:details.reservationId, - } - let res=await distributionStockupscanningCode(data) + async function ckscanningCode(item: any){ + details.isscan = item.taryLean + details.trayId = item.trayId + // let data={ + // stockupId:details.stockupId, + // trayId:item.trayId, + // reservationId:details.reservationId, + // } + // let res=await distributionStockupscanningCode(data) } function setorderStatus(state:number){ @@ -238,6 +256,19 @@ } }) } + /** 扫描接口 + * */ + async function scandata() { + let data={ + trayBarCode: details.scancode, + stockupId:details.stockupId, + trayId: details.trayId, + reservationId:details.reservationId, + } + let res=await distributionStockupscanningCode(data) + if(res.audio) utils.ttsspke(res.audio) + initpage() + } const { user,orderList,orderStatus,stockList }=toRefs(details) diff --git a/unpackage/dist/dev/mp-weixin/api/user.js b/unpackage/dist/dev/mp-weixin/api/user.js index 1f5f909..18b533f 100644 --- a/unpackage/dist/dev/mp-weixin/api/user.js +++ b/unpackage/dist/dev/mp-weixin/api/user.js @@ -756,6 +756,13 @@ function distributionTrayDetail(data) { data }); } +function postAbnormalTruckLoading(data) { + return utils_request.service({ + url: `logpm-distribution/app/delivery/abnormalLoading`, + method: "post", + data + }); +} exports.AppPdaversiondetail = AppPdaversiondetail; exports.BatchPrintPackages = BatchPrintPackages; exports.addvalueaddvalueInfo = addvalueaddvalueInfo; @@ -796,6 +803,7 @@ exports.distributionStockupupdateStockArea = distributionStockupupdateStockArea; exports.distributionTrayDetail = distributionTrayDetail; exports.getMyWarehouseList = getMyWarehouseList; exports.oauthtoken = oauthtoken; +exports.postAbnormalTruckLoading = postAbnormalTruckLoading; exports.preserveCurrentWarehouse = preserveCurrentWarehouse; exports.signforcustom = signforcustom; exports.signforinventory = signforinventory; diff --git a/unpackage/dist/dev/mp-weixin/config/host.js b/unpackage/dist/dev/mp-weixin/config/host.js index d07f03a..7365f41 100644 --- a/unpackage/dist/dev/mp-weixin/config/host.js +++ b/unpackage/dist/dev/mp-weixin/config/host.js @@ -1,5 +1,5 @@ "use strict"; -const devhost = "http://192.168.10.29:13000/"; +const devhost = "http://192.168.10.75:8777/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js index 3a1d38e..a3c8428 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js @@ -10,19 +10,22 @@ require("../../../config/host.js"); require("../../../utils/md5.js"); if (!Array) { const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar"); + const _easycom_u_popup2 = common_vendor.resolveComponent("u-popup"); const _component_tiplist = common_vendor.resolveComponent("tiplist"); const _component_saomiao2 = common_vendor.resolveComponent("saomiao2"); - (_easycom_u_navbar2 + _component_tiplist + _component_saomiao2)(); + (_easycom_u_navbar2 + _easycom_u_popup2 + _component_tiplist + _component_saomiao2)(); } const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js"; +const _easycom_u_popup = () => "../../../uni_modules/uview-plus/components/u-popup/u-popup.js"; if (!Math) { - (_easycom_u_navbar + cusSelects)(); + (_easycom_u_navbar + cusSelects + _easycom_u_popup)(); } const cusSelects = () => "../../../compoment/cus-selects-fan/cus-selects-fan.js"; const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "CustomerOrdersDetails", setup(__props) { const utils = common_vendor.inject("utils"); + const showPopup = common_vendor.ref(false); let details = common_vendor.reactive({ schanvalue: "", typearr: [ @@ -142,13 +145,22 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ let loadingId = common_vendor.index.getStorageSync("checkvehicle").id; if (details.orderStatus == 1) { let data = { + reservationId: details.items.id, deliveryId: details.id, loadingId, type: 1, barcode: details.scancode }; + data.barcode = "P00752306060908726"; let res = await api_user.deliveryloadingscan(data); console.log(res); + const { code, audio } = res; + if (code === 5e3) { + utils.ttsspke(audio); + showPopup.value = true; + } + if (code === 3001) + utils.ttsspke(audio); } else if (details.orderStatus == 2) { let data = { reservationId: details.items.id, @@ -169,6 +181,22 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.listcheckindex = index; } } + function abnormalTruckLoading() { + let loadingId = common_vendor.index.getStorageSync("checkvehicle").id; + let data = { + reservationId: details.items.id, + deliveryId: details.id, + loadingId, + type: 1, + barcode: details.scancode + }; + data.barcode = "P00842306030843402"; + api_user.postAbnormalTruckLoading(data); + showPopup.value = false; + } + function close() { + showPopup.value = false; + } const { listcheckindex, inputtxt, orderStatus, schanvalue, typearr, items, datalist } = common_vendor.toRefs(details); return (_ctx, _cache) => { return common_vendor.e({ @@ -241,7 +269,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }; }) } : {}, { - x: common_vendor.sr(tiplists, "03d20205-2", { + x: common_vendor.o(abnormalTruckLoading), + y: common_vendor.o(close), + z: common_vendor.o(close), + A: common_vendor.p({ + show: showPopup.value, + mode: "center", + customStyle: { + "padding": "20px", + "border-radius": "5px" + } + }), + B: common_vendor.sr(tiplists, "03d20205-3", { "k": "tiplists" }) }); diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.json b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.json index bf048b4..e20e4cd 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.json +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.json @@ -4,6 +4,7 @@ "navigationStyle": "custom", "usingComponents": { "u-navbar": "../../../uni_modules/uview-plus/components/u-navbar/u-navbar", + "u-popup": "../../../uni_modules/uview-plus/components/u-popup/u-popup", "cus-selects": "../../../compoment/cus-selects-fan/cus-selects-fan" } } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml index bdaa164..96cff52 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxml @@ -1 +1 @@ - 客户：{{b}} 录入包条码 备货是否完成：{{d}}装车是否完成：{{e}}订单总数{{f}}计划件数{{g}}装车件数{{h}}签收件数{{i}}齐套状态查询定制品库存品订单编号：{{item.b}}配送数：{{item.c}}已扫码数：{{item.d}}包条码：{{ite.a}}货物品类：{{ite.b}}扫描状态：{{ite.c}}{{item.g}}SKU：{{item.a}}物品：{{item.b}}规格：{{item.c}}单位：{{item.d}} \ No newline at end of file + 客户：{{b}} 录入包条码 备货是否完成：{{d}}装车是否完成：{{e}}订单总数{{f}}计划件数{{g}}装车件数{{h}}签收件数{{i}}齐套状态查询定制品库存品订单编号：{{item.b}}配送数：{{item.c}}已扫码数：{{item.d}}包条码：{{ite.a}}货物品类：{{ite.b}}扫描状态：{{ite.c}}{{item.g}}SKU：{{item.a}}物品：{{item.b}}规格：{{item.c}}单位：{{item.d}}是否进行异常装车 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js index 1b1cc03..0745297 100644 --- a/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js +++ b/unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js @@ -20,6 +20,7 @@ if (!Math) { const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "StockUplist", setup(__props) { + const utils = common_vendor.inject("utils"); const tiplists = common_vendor.ref(null); let details = common_vendor.reactive({ reservationId: "", @@ -33,7 +34,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }, stockList: [], stockupId: "", - items: {} + items: {}, + isscan: false, + scancode: "", + trayId: "" }); common_vendor.onLoad((op) => { details.reservationId = op.id; @@ -41,8 +45,21 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ details.items = JSON.parse(op.item); }); common_vendor.onShow(() => { + common_vendor.index.$on("scancodedate", function(code) { + if (code) { + console.log(code); + details.scancode = code; + details.isscan = true; + if (details.isscan) + scandata(); + } + }); initpage(); }); + common_vendor.onHide(() => { + common_vendor.index.$off("scancodedate"); + details.isscan = false; + }); function goorderdetail(item) { common_vendor.index.navigateTo({ url: "/pagesHome/pages/orderDetails/orderDetails?orderCode=" + item.orderCode @@ -59,13 +76,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }; details.orderList = []; let response = await api_user.distributionStockuporderList(data); - console.log(response); details.user.consignee = (_a = response.data) == null ? void 0 : _a.consignee; details.user.goodsAreaName = (_b = response.data) == null ? void 0 : _b.goodsAreaName; details.user.planNum = (_c = response.data) == null ? void 0 : _c.planNum; details.user.scanNum = (_d = response.data) == null ? void 0 : _d.scanNum; details.orderList = (_e = response.data) == null ? void 0 : _e.orderList; details.stockList = (_f = response.data) == null ? void 0 : _f.stockList; + details.isscan = false; } function godetails(item) { common_vendor.index.navigateTo({ @@ -73,12 +90,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }); } async function ckscanningCode(item) { - let data = { - stockupId: details.stockupId, - trayId: item.trayId, - reservationId: details.reservationId - }; - await api_user.distributionStockupscanningCode(data); + details.isscan = item.taryLean; + details.trayId = item.trayId; } function setorderStatus(state) { details.orderStatus = state; @@ -129,6 +142,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } }); } + async function scandata() { + let data = { + trayBarCode: details.scancode, + stockupId: details.stockupId, + trayId: details.trayId, + reservationId: details.reservationId + }; + let res = await api_user.distributionStockupscanningCode(data); + if (res.audio) + utils.ttsspke(res.audio); + initpage(); + } const { user, orderList, orderStatus, stockList } = common_vendor.toRefs(details); return (_ctx, _cache) => { return common_vendor.e({