Skip to content

X
xgdlapp
Commit 8c90ae38 authored by 李苏's avatar 李苏 💬
Browse files
Options

XGWCS1.02 新增库位清空

parent fdc6543c
Show whitespace changes
Inline Side-by-side
Showing with 449 additions and 36 deletions
.idea/workspace.xml
View file @ 8c90ae38
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="cad3b532-20c9-45b5-a856-e17039c7e45a" name="Default Changelist" comment="xgdlapp补充接口">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<list default="true" id="cad3b532-20c9-45b5-a856-e17039c7e45a" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -41,11 +40,31 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="5" column="7" lean-forward="true" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
<state relative-caret-position="114">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3686">
<caret line="202" selection-start-line="202" selection-end-line="202" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/common/router/index.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -61,6 +80,11 @@
<find>versionStringCompare</find>
<find>sqlPort</find>
<find>config.baseUrl</find>
<find>空托出库</find>
<find>apiYrkw</find>
<find>apiCode</find>
<find>gyscode</find>
<find>queryEmptyTpKw</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -70,6 +94,7 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/pages/index/index.vue" />
</list>
</option>
</component>
......@@ -96,6 +121,7 @@
<component name="NodePackageJsonFileManager">
<packageJsonPaths>
<path value="$PROJECT_DIR$/plugin/uni-simple-router/package.json" />
<path value="$PROJECT_DIR$/uni_modules/orange-fullloading/package.json" />
<path value="$PROJECT_DIR$/uni_modules/uni-collapse/package.json" />
<path value="$PROJECT_DIR$/uni_modules/uni-datetime-picker/package.json" />
<path value="$PROJECT_DIR$/uni_modules/uni-icons/package.json" />
......@@ -116,8 +142,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -133,13 +159,13 @@
<path>
<item name="xgdlapp" type="b2602c69:ProjectViewProjectNode" />
<item name="xgdlapp" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="util" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="xgdlapp" type="b2602c69:ProjectViewProjectNode" />
<item name="xgdlapp" type="462c0819:PsiDirectoryNode" />
<item name="uni_modules" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -197,7 +223,37 @@
<workItem from="1675127156851" duration="1210000" />
<workItem from="1675238189379" duration="1820000" />
<workItem from="1679363550222" duration="33000" />
<workItem from="1679560760023" duration="47000" />
<workItem from="1679560760023" duration="650000" />
<workItem from="1679994761477" duration="666000" />
<workItem from="1679998588964" duration="538000" />
<workItem from="1680052008050" duration="25000" />
<workItem from="1680071329135" duration="63000" />
<workItem from="1680072119607" duration="292000" />
<workItem from="1680764745044" duration="572000" />
<workItem from="1680772738511" duration="196000" />
<workItem from="1680849824212" duration="42000" />
<workItem from="1680851382806" duration="74000" />
<workItem from="1680859226625" duration="72000" />
<workItem from="1680859338760" duration="1417000" />
<workItem from="1681348804332" duration="57000" />
<workItem from="1681365432437" duration="7000" />
<workItem from="1681365555865" duration="53000" />
<workItem from="1681436034113" duration="359000" />
<workItem from="1681439073890" duration="1880000" />
<workItem from="1681455213979" duration="1375000" />
<workItem from="1682319434539" duration="1935000" />
<workItem from="1682325477315" duration="731000" />
<workItem from="1682414640391" duration="42000" />
<workItem from="1682416535240" duration="649000" />
<workItem from="1682588222768" duration="630000" />
<workItem from="1683602503482" duration="67000" />
<workItem from="1683613592124" duration="747000" />
<workItem from="1683623201327" duration="3000" />
<workItem from="1683627826650" duration="160000" />
<workItem from="1683681471709" duration="49000" />
<workItem from="1683688204596" duration="628000" />
<workItem from="1683699630908" duration="27000" />
<workItem from="1683708586223" duration="659000" />
</task>
<task id="LOCAL-00001" summary="徐工道路app初始化">
<created>1652260852330</created>
......@@ -297,17 +353,149 @@
<option name="project" value="LOCAL" />
<updated>1679558424159</updated>
</task>
<option name="localTasksCounter" value="15" />
<task id="LOCAL-00015" summary="组件">
<created>1679560853443</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1679560853443</updated>
</task>
<task id="LOCAL-00016" summary="dlapp新增接口">
<created>1679994785540</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1679994785540</updated>
</task>
<task id="LOCAL-00017" summary="修改pda">
<created>1679998659805</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1679998659805</updated>
</task>
<task id="LOCAL-00018" summary="过滤筛选">
<created>1680072313782</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1680072313782</updated>
</task>
<task id="LOCAL-00019" summary="道路新增空托出库的功能">
<created>1680764791702</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1680764791702</updated>
</task>
<task id="LOCAL-00020" summary="新增ph显示">
<created>1680849855115</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1680849855115</updated>
</task>
<task id="LOCAL-00021" summary="/* 开发,后端添加权限时删除该代码 */">
<created>1680851444644</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1680851444644</updated>
</task>
<task id="LOCAL-00022" summary="/* 移出入加库位码 */">
<created>1680861056383</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1680861056383</updated>
</task>
<task id="LOCAL-00023" summary="PDA叫料修改版本">
<created>1681436101116</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1681436101116</updated>
</task>
<task id="LOCAL-00024" summary="解锁">
<created>1681439097175</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1681439097175</updated>
</task>
<task id="LOCAL-00025" summary="queryCanCall 所有状态都查询">
<created>1681441008484</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1681441008484</updated>
</task>
<task id="LOCAL-00026" summary="queryCanCall 添加参数-gwid">
<created>1681442539064</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1681442539064</updated>
</task>
<task id="LOCAL-00027" summary="空托补充参数查询，mkid权限">
<created>1681457027488</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1681457027488</updated>
</task>
<task id="LOCAL-00028" summary="查询参数改下拉框">
<created>1682322252913</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1682322252913</updated>
</task>
<task id="LOCAL-00029" summary="弹框信息，路由删除所有定时器">
<created>1682416588063</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1682416588063</updated>
</task>
<task id="LOCAL-00030" summary="叫料添加请求蒙层，防止快速切换查询网络请求延迟产生问题">
<created>1683613686270</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1683613686270</updated>
</task>
<task id="LOCAL-00031" summary="服务器写死">
<created>1683627887751</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1683627887751</updated>
</task>
<task id="LOCAL-00032" summary="优化卡顿">
<created>1683688235857</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1683688235857</updated>
</task>
<task id="LOCAL-00033" summary="添加蒙层">
<created>1683709320318</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1683709320318</updated>
</task>
<option name="localTasksCounter" value="34" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="20658000" />
<option name="totallyTimeSpent" value="35276000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="830" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20174263" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1883378" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
......@@ -321,12 +509,13 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" visible="true" weight="0.37537092" />
<window_info active="true" anchor="bottom" id="Version Control" order="7" visible="true" weight="0.5281899" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="TypeScript" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.3837037" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.5890208" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Docker" order="12" show_stripe_button="false" />
<window_info anchor="bottom" id="Messages" order="13" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
......@@ -373,21 +562,32 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="徐工道路app初始化" />
<MESSAGE value="徐工道路新增界面。修改" />
<MESSAGE value="删除假数据" />
<MESSAGE value="入库作业对接" />
<MESSAGE value="APP入库出库地图接口对接" />
<MESSAGE value="APP入库出库地图接口对接，api防space" />
<MESSAGE value="优化界面&#10;组件化" />
<MESSAGE value="徐工道路APP" />
<MESSAGE value="1" />
<MESSAGE value="baseUrl设置修改" />
<MESSAGE value="Gtoken" />
<MESSAGE value="修改个人组件，修改密码+base64" />
<MESSAGE value="超级用户特殊处理" />
<MESSAGE value="补充功能" />
<option name="LAST_COMMIT_MESSAGE" value="补充功能" />
<MESSAGE value="组件" />
<MESSAGE value="dlapp新增接口" />
<MESSAGE value="修改pda" />
<MESSAGE value="过滤筛选" />
<MESSAGE value="道路新增空托出库的功能" />
<MESSAGE value="新增ph显示" />
<MESSAGE value="/* 开发,后端添加权限时删除该代码 */" />
<MESSAGE value="/* 移出入加库位码 */" />
<MESSAGE value="PDA叫料修改版本" />
<MESSAGE value="解锁" />
<MESSAGE value="queryCanCall 所有状态都查询" />
<MESSAGE value="queryCanCall 添加参数-gwid" />
<MESSAGE value="空托补充参数查询，mkid权限" />
<MESSAGE value="查询参数改下拉框" />
<MESSAGE value="弹框信息，路由删除所有定时器" />
<MESSAGE value="叫料添加请求蒙层，防止快速切换查询网络请求延迟产生问题" />
<MESSAGE value="服务器写死" />
<MESSAGE value="优化卡顿" />
<MESSAGE value="添加蒙层" />
<option name="LAST_COMMIT_MESSAGE" value="添加蒙层" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/common/util/date.js">
......@@ -408,9 +608,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423">
<caret line="197" column="36" selection-start-line="197" selection-start-column="36" selection-end-line="197" selection-end-column="36" />
<folding>
<element signature="e#0#51#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -436,8 +633,24 @@
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="5" column="7" lean-forward="true" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
<state relative-caret-position="114">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/index.vue">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3686">
<caret line="202" selection-start-line="202" selection-end-line="202" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/router/index.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
api/dlapi.js
View file @ 8c90ae38
......@@ -297,3 +297,15 @@ export function queryRqgys(params){
return filter(e)
})
}
/* 清空库位接口 */
export function searchKwByKwCode(params){
return http.post("/xgwcs/kwcx/searchKwByKwCode", params || {}).then(e => {
return filter(e)
})
}
export function emptyKwByCode(params){
return http.post("/xgwcs/kwcx/emptyKwByCode", params || {}).then(e => {
return filter(e)
})
}
common/router/modules/routes.js
View file @ 8c90ae38
......@@ -179,6 +179,13 @@ const routes = [
{
path: '/pages/dl_kw_adjust/index',
name: 'kwAdjust',
meta: {
title: '清空工位',
},
},
{
path: '/pages/dl_kw_clear/index',
name: 'kwClear',
meta: {
title: '清空库位',
},
......
manifest.json
View file @ 8c90ae38
......@@ -2,8 +2,8 @@
"name" : "wcs",
"appid" : "__UNI__79C58F0",
"description" : "徐工道路系统功能",
"versionName" : "1.0.0",
"versionCode" : 100,
"versionName" : "1.0.2",
"versionCode" : 102,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......
pages.json
View file @ 8c90ae38
......@@ -156,7 +156,7 @@
}
},
/* 清空库位 */
/* 清空工位 */
{
"path" : "pages/dl_kw_adjust/index",
......@@ -166,6 +166,16 @@
"enablePullDownRefresh": false
}
},
/* 清空库位 */
{
"path" : "pages/dl_kw_clear/index",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
/* 修改密码界面 */
{
......
pages/dl_kw_clear/index.vue 0 → 100644
View file @ 8c90ae38
<template>
<view class="bg-white">
<cu-custom bgColor="bg-gradual-blue" :isBack="true">
<block slot="content">清空库位</block>
<block slot="backText">返回</block>
</cu-custom>
<!-- 添加蒙层 -->
<orange-fullloading :loadicon='loadicon' :loadshow='loadshow' bgcolor="rgba(128, 128, 128, 0.5)" :text="loadtext"></orange-fullloading>
<view class="cu-form-group">
<view class="title ">库位码</view>
<input v-model="dmcode" placeholder="请扫描库位码" focus="true" @confirm="apiGetDminfo()"></input>
<Scan :app="app" :params="'dmcode'" :do="'apiGetDminfo'" ></Scan>
</view>
<view class="cu-form-group disable">
<view class="title ">已扫库位码</view>
<input v-model="ysdmcode" disabled="" focus="true"></input>
</view>
<view v-if="dminfo.id">
<view class="flex flex-wrap padding bg-grey white radio" style="position: relative;">
<view class="basis-sm margin-top-xs margin-bottom-xs radius">库位码编号:<span>{{dminfo.code}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{dminfo.name}}</span></view>
</view>
</view>
<view class="padding flex align-center bg-white justify-around">
<button class="cu-btn bg-gradual-green lg wid50" @tap="isbctz(2)">清空</button>
</view>
</view>
</view>
</template>
<script>
import api from '@/api/api.js';
import {
searchKwByKwCode,
adjustTry,
emptyKwByCode
} from '@/api/dlapi.js'
export default {
data() {
return {
loadshow:false,
loadicon:'/static/loading.png',
loadtext:'数据请求中...',
/* 配盘点数据结构 */
app:this,
selected: "",
ysdmcode: "",
modalName: "",
dmcode: "",
dminfo:{},
}
},
methods: {
// api保存调整
apiadjustTry(){
this.loadshow=true
setTimeout(()=>{
this.loadshow=false
},2000)
let data={
"code": this.dminfo.code
}
emptyKwByCode(data).then(e=>{
if(e){
this.loadshow=false
this.$tip.alert("清空成功");
this.dmcode = ""
this.ysdmcode = ""
this.dminfo = {}
}
})
},
isbctz() {
let that=this
if (this.ysdmcode) {
uni.showModal({
title: '提示',
content: '是否清空该工位',
cancelText: "否", // 取消按钮的文字
confirmText: "是", // 确认按钮的文字
success: function (res) {
if (res.confirm) {
that.apiadjustTry()
} else if (res.cancel) {
}
}
});
} else {
this.$tip.alert("请先扫描有效库位码信息");
}
},
hideModal() {
this.modalName = ""
},
// 弹框
confirm(e) {
this.modalName = "DialogModal" + e
},
// 删除确认
deldata(item, index) {
let that=this
uni.showModal({
title: '提示',
content: '是否删除该条信息',
cancelText: "否", // 取消按钮的文字
confirmText: "是", // 确认按钮的文字
success: function (res) {
if (res.confirm) {
that.dminfo.splice(that.selected, 1)
} else if (res.cancel) {
}
}
});
},
// 获取库位码信息
apiGetDminfo() {
let data={
"code": this.dmcode
}
searchKwByKwCode(data).then(data => {
if (data && data.records) {
this.ysdmcode = data.records.code
this.dminfo = data.records
} else {
this.dmcode = ""
this.ysdmcode = ""
}
})
}
},
onLoad(e) {
// if(e.query){
// console.log(e.query)
// let dmcode=JSON.parse(e.query).dmcode
// this.dmcode=dmcode
// this.apiGetDminfo()
// }else{
// console.log("no message")
// }
}
}
</script>
<style scoped>
/deep/.uni-numbox-btns {
width: 27.69px !important;
}
.disable {
background-color: #F5F5F5
}
.wid50 {
width: 50%;
}
</style>
pages/index/index.vue
View file @ 8c90ae38
......@@ -65,7 +65,7 @@
<view class="padding-sm" v-if="newyrycList.length!=0">
<view class="cu-bar bg-white solid-bottom">
<view class="action text-bold">
<text class='cuIcon-title text-blue'></text>移库管理
<text class='cuIcon-title text-blue'></text>库位管理
</view>
</view>
<view class="grid col-2 bg-white">
......@@ -177,7 +177,14 @@
useCount: 1000,
page: "outIn",
mkid:993001200
}, ],
},
{
title: "清空库位",
icon: "/static/icon/work5.png",
useCount: 1000,
page: "kwClear",
mkid:993001600
}],
newyrycList: [],
// icon:"/wcs/apps/static/icon/work.png",pc端图标路径
//手机端去除/wcs/xgapps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment