Skip to content

施宇 / Warehouse

Go to a project
Commit 9c7d4efe by 施宇
Options

1

parent 89762d0e
Inline Side-by-side
Showing with 35 additions and 11 deletions
.wechatide/fileCache.cfg
{"ignoreds":["node_modules/**/*","**/node_modules/**","**/.git/**",".git/**/*","**/.svn/**",".svn/**/*",".DS_Store","**/.DS_Store"],"folderInfo":{"./":{"mtimeMs":1588039958728.2603,"children":["app.js","app.json","app.wxss","project.config.json","sitemap.json"]},"pages/":{"mtimeMs":1588761186704.5857,"children":[]},"res/":{"mtimeMs":1587987929535.54,"children":[]},"res/css/":{"mtimeMs":1587468648224.7944,"children":["res/css/base.wxss"]},"res/img/":{"mtimeMs":1588153975467.2988,"children":["res/img/all-check-left-a.png","res/img/all-check-left.png","res/img/all-check-right-a.png","res/img/all-check-right.png","res/img/ck-icon-a.png","res/img/ck-icon.png","res/img/close-icon.png","res/img/kc-icon-a.png","res/img/kc-icon.png","res/img/login-img.png","res/img/login-text.png","res/img/nav-arrow-down.png","res/img/question-icon.png","res/img/search-icon.png","res/img/sh-icon-a.png","res/img/sh-icon.png","res/img/sigle-check-left-a.png","res/img/sigle-check-left.png","res/img/sigle-check-right-a.png","res/img/sigle-check-right.png","res/img/sj-icon-a.png","res/img/sj-icon.png","res/img/sz-icon-a.png","res/img/sz-icon.png","res/img/warn-icon.png"]},"utils/":{"mtimeMs":1588729595864.972,"children":["utils/api.js","utils/axios.js","utils/md5.js","utils/printerjobs.js","utils/textEncoding.js","utils/util.js"]},".git/":{"mtimeMs":1589252371111.6897,"children":[]},".wechatide/":{"mtimeMs":1587519550088.0625,"children":[".wechatide/fileCache.cfg"]},"pages/home/":{"mtimeMs":1587536014892.4702,"children":["pages/home/home.js","pages/home/home.json","pages/home/home.wxml","pages/home/home.wxss"]},"pages/login/":{"mtimeMs":1587535974795.0686,"children":["pages/login/login.js","pages/login/login.json","pages/login/login.wxml","pages/login/login.wxss"]},"components/":{"mtimeMs":1587538211879.0247,"children":[]},"components/navC/":{"mtimeMs":1587538221287.4016,"children":["components/navC/navC.js","components/navC/navC.json","components/navC/navC.wxml","components/navC/navC.wxss"]},"pages/receivinggoods/":{"mtimeMs":1587538742321.587,"children":["pages/receivinggoods/receivinggoods.js","pages/receivinggoods/receivinggoods.json","pages/receivinggoods/receivinggoods.wxml","pages/receivinggoods/receivinggoods.wxss"]},"pages/upperShelf/":{"mtimeMs":1587622056930.153,"children":["pages/upperShelf/upperShelf.js","pages/upperShelf/upperShelf.json","pages/upperShelf/upperShelf.wxml","pages/upperShelf/upperShelf.wxss"]},"pages/outbound/":{"mtimeMs":1587626008346.8442,"children":["pages/outbound/outbound.js","pages/outbound/outbound.json","pages/outbound/outbound.wxml","pages/outbound/outbound.wxss"]},"pages/scanDelivery/":{"mtimeMs":1587627596586.3196,"children":["pages/scanDelivery/scanDelivery.js","pages/scanDelivery/scanDelivery.json","pages/scanDelivery/scanDelivery.wxml","pages/scanDelivery/scanDelivery.wxss"]},"pages/picking/":{"mtimeMs":1587631234329.3645,"children":["pages/picking/picking.js","pages/picking/picking.json","pages/picking/picking.wxml","pages/picking/picking.wxss"]},"pages/cardBoard/":{"mtimeMs":1587632724321.1174,"children":["pages/cardBoard/cardBoard.js","pages/cardBoard/cardBoard.json","pages/cardBoard/cardBoard.wxml","pages/cardBoard/cardBoard.wxss"]},"pages/changeWarehouse/":{"mtimeMs":1587635396534.957,"children":["pages/changeWarehouse/changeWarehouse.js","pages/changeWarehouse/changeWarehouse.json","pages/changeWarehouse/changeWarehouse.wxml","pages/changeWarehouse/changeWarehouse.wxss"]},"pages/systemSettings/":{"mtimeMs":1587637181028.4365,"children":["pages/systemSettings/systemSettings.js","pages/systemSettings/systemSettings.json","pages/systemSettings/systemSettings.wxml","pages/systemSettings/systemSettings.wxss"]},"pages/printer/":{"mtimeMs":1587637593187.5686,"children":["pages/printer/printer.js","pages/printer/printer.json","pages/printer/printer.wxml","pages/printer/printer.wxss"]},"pages/inventoryQuery/":{"mtimeMs":1587639536186.8396,"children":["pages/inventoryQuery/inventoryQuery.js","pages/inventoryQuery/inventoryQuery.json","pages/inventoryQuery/inventoryQuery.wxml","pages/inventoryQuery/inventoryQuery.wxss"]},"pages/startPage/":{"mtimeMs":1588045543126.067,"children":["pages/startPage/startPage.js","pages/startPage/startPage.json","pages/startPage/startPage.wxml","pages/startPage/startPage.wxss"]},"pages/mountingPlate/":{"mtimeMs":1588761190467.1958,"children":["pages/mountingPlate/mountingPlate.js","pages/mountingPlate/mountingPlate.json","pages/mountingPlate/mountingPlate.wxml","pages/mountingPlate/mountingPlate.wxss"]}},"cacheVersion":1} {"ignoreds":["node_modules/**/*","**/node_modules/**","**/.git/**",".git/**/*","**/.svn/**",".svn/**/*",".DS_Store","**/.DS_Store"],"folderInfo":{"./":{"mtimeMs":1588039958728.2603,"children":["app.js","app.json","app.wxss","project.config.json","sitemap.json"]},"pages/":{"mtimeMs":1588761186704.5857,"children":[]},"res/":{"mtimeMs":1587987929535.54,"children":[]},"res/css/":{"mtimeMs":1587468648224.7944,"children":["res/css/base.wxss"]},"res/img/":{"mtimeMs":1589272520160.337,"children":["res/img/all-check-left-a.png","res/img/all-check-left.png","res/img/all-check-right-a.png","res/img/all-check-right.png","res/img/ck-icon-a.png","res/img/ck-icon.png","res/img/close-icon.png","res/img/confirm.png","res/img/kc-icon-a.png","res/img/kc-icon.png","res/img/login-img.png","res/img/login-text.png","res/img/nav-arrow-down.png","res/img/question-icon.png","res/img/search-icon.png","res/img/sh-icon-a.png","res/img/sh-icon.png","res/img/sigle-check-left-a.png","res/img/sigle-check-left.png","res/img/sigle-check-right-a.png","res/img/sigle-check-right.png","res/img/sj-icon-a.png","res/img/sj-icon.png","res/img/sz-icon-a.png","res/img/sz-icon.png","res/img/warn-icon.png"]},"utils/":{"mtimeMs":1588729595864.972,"children":["utils/api.js","utils/axios.js","utils/md5.js","utils/printerjobs.js","utils/textEncoding.js","utils/util.js"]},".git/":{"mtimeMs":1589280623339.0547,"children":[]},".wechatide/":{"mtimeMs":1587519550088.0625,"children":[".wechatide/fileCache.cfg"]},"pages/home/":{"mtimeMs":1587536014892.4702,"children":["pages/home/home.js","pages/home/home.json","pages/home/home.wxml","pages/home/home.wxss"]},"pages/login/":{"mtimeMs":1587535974795.0686,"children":["pages/login/login.js","pages/login/login.json","pages/login/login.wxml","pages/login/login.wxss"]},"components/":{"mtimeMs":1587538211879.0247,"children":[]},"components/navC/":{"mtimeMs":1587538221287.4016,"children":["components/navC/navC.js","components/navC/navC.json","components/navC/navC.wxml","components/navC/navC.wxss"]},"pages/receivinggoods/":{"mtimeMs":1587538742321.587,"children":["pages/receivinggoods/receivinggoods.js","pages/receivinggoods/receivinggoods.json","pages/receivinggoods/receivinggoods.wxml","pages/receivinggoods/receivinggoods.wxss"]},"pages/upperShelf/":{"mtimeMs":1587622056930.153,"children":["pages/upperShelf/upperShelf.js","pages/upperShelf/upperShelf.json","pages/upperShelf/upperShelf.wxml","pages/upperShelf/upperShelf.wxss"]},"pages/outbound/":{"mtimeMs":1587626008346.8442,"children":["pages/outbound/outbound.js","pages/outbound/outbound.json","pages/outbound/outbound.wxml","pages/outbound/outbound.wxss"]},"pages/scanDelivery/":{"mtimeMs":1587627596586.3196,"children":["pages/scanDelivery/scanDelivery.js","pages/scanDelivery/scanDelivery.json","pages/scanDelivery/scanDelivery.wxml","pages/scanDelivery/scanDelivery.wxss"]},"pages/picking/":{"mtimeMs":1587631234329.3645,"children":["pages/picking/picking.js","pages/picking/picking.json","pages/picking/picking.wxml","pages/picking/picking.wxss"]},"pages/cardBoard/":{"mtimeMs":1587632724321.1174,"children":["pages/cardBoard/cardBoard.js","pages/cardBoard/cardBoard.json","pages/cardBoard/cardBoard.wxml","pages/cardBoard/cardBoard.wxss"]},"pages/changeWarehouse/":{"mtimeMs":1587635396534.957,"children":["pages/changeWarehouse/changeWarehouse.js","pages/changeWarehouse/changeWarehouse.json","pages/changeWarehouse/changeWarehouse.wxml","pages/changeWarehouse/changeWarehouse.wxss"]},"pages/systemSettings/":{"mtimeMs":1587637181028.4365,"children":["pages/systemSettings/systemSettings.js","pages/systemSettings/systemSettings.json","pages/systemSettings/systemSettings.wxml","pages/systemSettings/systemSettings.wxss"]},"pages/printer/":{"mtimeMs":1587637593187.5686,"children":["pages/printer/printer.js","pages/printer/printer.json","pages/printer/printer.wxml","pages/printer/printer.wxss"]},"pages/inventoryQuery/":{"mtimeMs":1587639536186.8396,"children":["pages/inventoryQuery/inventoryQuery.js","pages/inventoryQuery/inventoryQuery.json","pages/inventoryQuery/inventoryQuery.wxml","pages/inventoryQuery/inventoryQuery.wxss"]},"pages/startPage/":{"mtimeMs":1588045543126.067,"children":["pages/startPage/startPage.js","pages/startPage/startPage.json","pages/startPage/startPage.wxml","pages/startPage/startPage.wxss"]},"pages/mountingPlate/":{"mtimeMs":1588761190467.1958,"children":["pages/mountingPlate/mountingPlate.js","pages/mountingPlate/mountingPlate.json","pages/mountingPlate/mountingPlate.wxml","pages/mountingPlate/mountingPlate.wxss"]}},"cacheVersion":1}
\ No newline at end of file \ No newline at end of file
pages/picking/picking.js
...@@ -14,8 +14,8 @@ Page({ ...@@ -14,8 +14,8 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
rwVal:"JH20050710000", rwVal:"",
hwVal:"0", hwVal:"",
kbVal:"", kbVal:"",
listArr:[], listArr:[],
initId:"", initId:"",
......
pages/upperShelf/upperShelf.js
...@@ -244,11 +244,12 @@ Page({ ...@@ -244,11 +244,12 @@ Page({
maskText:"箱号存于卡板记录中，请直接扫描卡板上架。" maskText:"箱号存于卡板记录中，请直接扫描卡板上架。"
}); });
return; return;
} else{ } else if(type == 2&&info.pallet_id==0){
me.setData({ me.setData({
listArr:[info], listArr:[info],
receivingId:info.box_id receivingId:info.box_id
}) })
return
} }
if(type == 3){ if(type == 3){
if(info.pallet_id!=0){ if(info.pallet_id!=0){
...@@ -258,13 +259,13 @@ Page({ ...@@ -258,13 +259,13 @@ Page({
}) })
return; return;
}else if(info.box_id!=0){ }else if(info.box_id!=0){
console.log(111)
me.setData({ me.setData({
isShowMask:true, isShowMask:true,
maskText:"型号存于箱记录中，请直接扫描卡板上架。" maskText:"型号存于箱记录中，请直接扫描卡板上架。"
}) })
return; return;
}else{ }else{
// 109P0424J3013
me.setData({ me.setData({
listArr:[info], listArr:[info],
receivingId:info.receiving_id receivingId:info.receiving_id
......
pages/upperShelf/upperShelf.wxml
...@@ -39,11 +39,34 @@ ...@@ -39,11 +39,34 @@
<view class="td-1 td borderBox Iflex jcc aic td-140" ><text>{{rwVal}}</text></view> <view class="td-1 td borderBox Iflex jcc aic td-140" ><text>{{rwVal}}</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>未上架</text></view> <view class="td-2 td borderBox Iflex jcc aic"><text>未上架</text></view>
<!-- <view class="td-2 td borderBox Iflex jcc aic"><text>货位</text></view> --> <!-- <view class="td-2 td borderBox Iflex jcc aic"><text>货位</text></view> -->
<view class="td-2 td borderBox Iflex jcc aic td-119"><text>{{item.pallet_sn||"--"}}</text></view> <block wx:if="{{item.pallet_id !=0 }}">
<view class="td-2 td borderBox Iflex jcc aic td-119"><text>{{item.box_sn||"--"}}</text></view> <view class="td-2 td borderBox Iflex jcc aic td-119"><text>{{item.pallet.pallet_sn||item.pallet_sn||"--"}}</text></view>
<view class="td-2 td borderBox Iflex jcc aic td-141"><text>{{item.goods_name||"--"}}</text></view> <view class="td-2 td borderBox Iflex jcc aic td-119"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>{{item.brand_name||"--"}}</text></view> <view class="td-2 td borderBox Iflex jcc aic td-141"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>{{item.number||"--"}}</text></view> <view class="td-2 td borderBox Iflex jcc aic"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>--</text></view>
</block>
<block wx:else>
<block wx:if="{{item.box_id !=0 }}">
<view class="td-2 td borderBox Iflex jcc aic td-119"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic td-119"><text>{{item.box.box_sn||item.box_sn||"--"}}</text></view>
<view class="td-2 td borderBox Iflex jcc aic td-141"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>--</text></view>
</block>
<block wx:else>
<view class="td-2 td borderBox Iflex jcc aic td-119"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic td-119"><text>--</text></view>
<view class="td-2 td borderBox Iflex jcc aic td-141"><text>{{item.goods_name||"--"}}</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>{{item.brand_name||"--"}}</text></view>
<view class="td-2 td borderBox Iflex jcc aic"><text>{{item.number||"--"}}</text></view>
</block>
</block>
<!-- <view class="td-2 td borderBox Iflex jcc aic td-119"><text>{{item.pallet_sn||"--"}}</text></view> -->
<!-- <view class="td-2 td borderBox Iflex jcc aic td-119"><text>{{item.box_sn||"--"}}</text></view> -->
<!-- <view class="td-2 td borderBox Iflex jcc aic td-141"><text>{{item.goods_name||"--"}}</text></view> -->
<!-- <view class="td-2 td borderBox Iflex jcc aic"><text>{{item.brand_name||"--"}}</text></view> -->
<!-- <view class="td-2 td borderBox Iflex jcc aic"><text>{{item.number||"--"}}</text></view> -->
</view> </view>
</block> </block>
......
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 sign in to comment