java_project
/
logpm
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增按托盘卸车

myd
qb 1 year ago
parent
638abae69b
commit
6018d50586
6 changed files with 631 additions and 408 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      config/host.js
  2. 10
      pagesHome/pages/ArrivalList/ArrivalList.vue
  3. 36
      pagesHome/pages/StowageListDetails/StowageListDetails.vue
  4. 109
      pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
  5. 2
      unpackage/dist/dev/app-plus/app-config-service.js
  6. 736
      unpackage/dist/dev/app-plus/app-service.js

4
config/host.js
Unescape View File

@ -8,7 +8,7 @@
// lmy // lmy
// const devhost = 'http://192.168.10.123:8889/' // const devhost = 'http://192.168.10.123:8889/'
// zhy // zhy
// const devhost = 'http://192.168.10.48:13000/' const devhost = 'http://192.168.10.48:13000/'
// tjj // tjj
// const devhost = 'http://192.168.10.25:13000/' // const devhost = 'http://192.168.10.25:13000/'
// cyz // cyz
@ -16,7 +16,7 @@
// const devhost = 'http://192.168.6.141:8777/' // const devhost = 'http://192.168.6.141:8777/'
// 正式 // 正式
// const devhost = 'http://h5uapi.huitongys.com/' // const devhost = 'http://h5uapi.huitongys.com/'
const devhost = 'https://h5uapi.huitongys.com/' // const devhost = 'https://h5uapi.huitongys.com/'
// cg // cg
// const devhost = 'http://192.168.10.200:13000/' // const devhost = 'http://192.168.10.200:13000/'
/** /**

10
pagesHome/pages/ArrivalList/ArrivalList.vue
Unescape View File

@ -38,7 +38,7 @@
<view class="items_row"> <view class="items_row">
<view> <view>
实际装车/计划装车: {{item.realLoadingNumber/item.planLoadingNumber}} 实际装车/计划装车: {{item.realLoadingNumber + '/' +item.planLoadingNumber}}
</view> </view>
<view> <view>
@ -65,11 +65,11 @@
</view> </view>
<view class="button-container"> <view class="button-container">
<view class="button" @click="handleDetailsByOrder(item)"> <view class="button" @click="handleDetailsByOrder(item, 1)">
按件入库 按件入库
</view> </view>
<view class="button"> <view class="button" @click="handleDetailsByOrder(item, 2)">
整托入库 整托入库
</view> </view>
@ -318,9 +318,9 @@
} }
/** 按件入库 */ /** 按件入库 */
const handleDetailsByOrder = (item) => { const handleDetailsByOrder = (item, type) => {
uni.navigateTo({ uni.navigateTo({
url: '/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails?id=' + item.id + '&type=' + '1' url: '/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails?id=' + item.id + '&type=' + type
}) })
} }

36
pagesHome/pages/StowageListDetails/StowageListDetails.vue
Unescape View File

@ -216,38 +216,6 @@
</view> </view>
</view> </view>
</block> </block>
<!-- <u-collapse>
<block v-for="item in details.trayInfo.zeroList" :key="item">
<u-collapse-item name="Docs guide">
<template #title>
<view class="flex-c-sb">
<view class="">
订单号: {{item.associationValue}}
</view>
<view class="">
在托数量: {{item.num}}
</view>
</view>
</template>
<block v-for="value in item.details" :key="value">
<view class="flex-c-sb" style="margin: 5px 0;">
<view class="">
产品名称: {{value.productName}}
</view>
<view class="">
在托可用: {{value.stockNum}}
</view>
<view class="">
在库数: {{value.stockNum}}
</view>
</view>
<inputNum v-model="value.enterNum" :minNum="0" :maxNum="value.stockNum" />
</block>
</u-collapse-item>
</block>
</u-collapse> -->
<view class=""> <view class="">
定制品: 定制品:
@ -552,8 +520,10 @@
async function scandata() { async function scandata() {
try { try {
uni.showLoading() uni.showLoading()
// 按件装车
if (Number(details.pageType) === 1) await scanOrder() if (Number(details.pageType) === 1) await scanOrder()
else await scanTray() // 整托装车
else if (Number(details.pageType === 2)) await scanTray()
} catch (err) { } catch (err) {
console.log('err :>> ', err); console.log('err :>> ', err);
//TODO handle the exception //TODO handle the exception

109
pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
Unescape View File

@ -6,9 +6,12 @@
<view> <view>
配载批次：{{details.pageInfo.carsNo}} 配载批次：{{details.pageInfo.carsNo}}
</view> </view>
<view class="butlur" @click="showsdqs"> <view class="butlur" v-if="Number(details.pageType) !== 2" @click="showsdqs">
录入包条码 录入包条码
</view> </view>
<view class="butlur" v-else @click="showsdqs">
录入托盘码
</view>
</view> </view>
<view> <view>
<view>司机名称：{{details.pageInfo.driverName}}</view> <view>司机名称：{{details.pageInfo.driverName}}</view>
@ -62,6 +65,7 @@
<jp-virtual-list code="id" class="h100" :refresher="false" :data="datalist" ref="search"> <jp-virtual-list code="id" class="h100" :refresher="false" :data="datalist" ref="search">
<template v-slot="{ list }"> <template v-slot="{ list }">
<view v-for="item in list" :key="item.orderCode" :id="item.orderCode" :ref="item.orderCode"> <view v-for="item in list" :key="item.orderCode" :id="item.orderCode" :ref="item.orderCode">
<template v-if="Number(orderStatus) !== 3">
<PullDownBox> <PullDownBox>
<template #title> <template #title>
<view class="contenbx1"> <view class="contenbx1">
@ -144,6 +148,31 @@
</block> </block>
</template> </template>
</PullDownBox> </PullDownBox>
</template>
<template v-else>
<view class="abnormal">
<view class="flex-c-sb" style="zoom: 0.9;">
<view class="flex1">
包条码: {{item.scanCode}}
</view>
<view class="flex1" style="display: flex; align-items: center; margin-left:5px;">
卸车状态:
<view class="tip">
{{Number(item.scanStatus) === 1? '已装车': Number(item.scanStatus) === 2? '已卸车': '已签收'}}
</view>
</view>
</view>
<view class="flex-c-sb mt10" style="zoom: 0.9;">
<view class="flex1">
托盘名称: {{item.trayName || '暂无数据'}}
</view>
<view class="flex1">
托盘码: {{item.trayCode || '暂无数据'}}
</view>
</view>
</view>
</template>
</view> </view>
</template> </template>
</jp-virtual-list> </jp-virtual-list>
@ -314,6 +343,14 @@
details.pageType = op.type details.pageType = op.type
option.title = Number(op.type) === 2 ? '配载整托卸车' : '配载按件卸车' option.title = Number(op.type) === 2 ? '配载整托卸车' : '配载按件卸车'
let content = ''
if (Number(details.pageType) === 1) content = '请扫描包件码'
else if (Number(details.pageType) === 2) content = '请扫描托盘码'
// #ifdef APP
utils.ttsspke(content)
// #endif
}) })
/** 查看订单详情 -- 上架数据(保留页面, 后续跳详情直接cv) */ /** 查看订单详情 -- 上架数据(保留页面, 后续跳详情直接cv) */
@ -431,6 +468,29 @@
console.log('details.datalist :>> ', details.datalist); console.log('details.datalist :>> ', details.datalist);
} }
/** 包件卸车 -- 单个 */
const handleOrderStowage = async (_scanCode) => {
try {
uni.showLoading({
mask: true
})
const submitData = {
orderPackageCode: _scanCode,
loadId: details.loadId
}
const res = await postCarsLoadUnloadPackage(submitData)
return res
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
} finally {
uni.hideLoading()
// 刷新
basicContainer.value.startPullDownRefresh()
}
}
/** 扫描包件 */ /** 扫描包件 */
const scanOrder = async () => { const scanOrder = async () => {
OrderStowage.value.details.showPopUp = false OrderStowage.value.details.showPopUp = false
@ -502,22 +562,34 @@
return return
} }
if (_trayCode) {
tiplists.value.setdetails({
isshow: true,
tipstate: 2,
list: [],
isonecheck: true,
title: '是否整托装车',
success: () => {
tiplists.value.setdetails({ isshow: false })
// 整托卸车
scanTray()
},
cancel: async () => {
tiplists.value.setdetails({ isshow: false })
try { handleOrderStowage(_scanCode)
const submitData = { },
orderPackageCode: _scanCode, close: () => {
loadId: details.loadId tiplists.value.setdetails({ isshow: false })
} }
const res = await postCarsLoadUnloadPackage(submitData) })
return res details.scancode = _trayCode
return
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
} finally {
// 刷新
basicContainer.value.startPullDownRefresh()
} }
handleOrderStowage(_scanCode)
} }
/** 扫描托盘 */ /** 扫描托盘 */
@ -577,6 +649,7 @@
function scandata() { function scandata() {
// 按件卸车 // 按件卸车
if (Number(details.pageType) === 1) scanOrder() if (Number(details.pageType) === 1) scanOrder()
else if (Number(details.pageType) === 2) scanTray()
} }
/** 返回上一页 */ /** 返回上一页 */
@ -626,10 +699,10 @@
title: content, title: content,
icon: 'none' icon: 'none'
}) })
// return return
} }
// 检测该零担是否有托盘信息; 有: 询问是否整托卸车 // 检测该零担是否有托盘信息; 有: 询问是否整托卸车, 当在整托卸车时, 不允许单独卸车
if (_value.trayCode) { if (_value.trayCode) {
tiplists.value.setdetails({ tiplists.value.setdetails({
@ -646,6 +719,7 @@
cancel: () => { cancel: () => {
tiplists.value.setdetails({ isshow: false }) tiplists.value.setdetails({ isshow: false })
if (Number(details.pageType) === 2) return
handleZeroSoleStowage(_item, _value) handleZeroSoleStowage(_item, _value)
}, },
close: () => { close: () => {
@ -656,6 +730,7 @@
return return
} }
if (Number(details.pageType) === 2) return
handleZeroSoleStowage(_item, _value) handleZeroSoleStowage(_item, _value)
} }
@ -871,7 +946,9 @@
// 异常 // 异常
.abnormal { .abnormal {
background: linear-gradient(0% #000000 50% #0086F1); padding: 10upx;
background: #fff;
margin: 5upx 0;
} }
.w100 { .w100 {

2
unpackage/dist/dev/app-plus/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

736
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save