Skip to content

施宇 / Warehouse

Go to a project
Commit 894f2d5f by 施宇
Options

1

parent 3e24ddbc
Inline Side-by-side
Showing with 55 additions and 56 deletions
app.json
{ {
"pages": [ "pages": [
"pages/receivinggoods/receivinggoods", "pages/startPage/startPage",
"pages/home/home", "pages/home/home",
"pages/cardBoard/cardBoard",
"pages/receivinggoods/receivinggoods",
"pages/scanDelivery/scanDelivery", "pages/scanDelivery/scanDelivery",
"pages/cardBoard/cardBoard",
"pages/mountingPlate/mountingPlate", "pages/mountingPlate/mountingPlate",
"pages/picking/picking", "pages/picking/picking",
...@@ -20,7 +24,6 @@ ...@@ -20,7 +24,6 @@
"pages/startPage/startPage",
"pages/changeWarehouse/changeWarehouse", "pages/changeWarehouse/changeWarehouse",
"pages/login/login", "pages/login/login",
"pages/systemSettings/systemSettings", "pages/systemSettings/systemSettings",
......
pages/cardBoard/cardBoard.js
...@@ -118,6 +118,7 @@ Page({ ...@@ -118,6 +118,7 @@ Page({
content: '箱号不存在', content: '箱号不存在',
showCancel: false showCancel: false
}); });
return
} }
arr.push({ arr.push({
...@@ -160,15 +161,15 @@ Page({ ...@@ -160,15 +161,15 @@ Page({
} }
getData(apis.pallet_box_list, 'post', {"pallet_sn":me.data.numText}, function(res) { getData(apis.pallet_box_list, 'post', {"pallet_sn":me.data.numText}, function(res) {
if (res.errcode === 0) { if (res.errcode === 0) {
let data = res.data; let data = res.data||[];
let listArr = []; let listArr = [];
let palletObj =null; let palletObj =null;
if(!data.data){ if(!data||!data.length){
listArr = []; listArr = [];
palletObj = null palletObj = null
}else{ }else{
let data = res.data.data; let data = res.data[0];
if(data.status == 2){ if(data.pallet_status == 2){
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '卡板为上架状态，不可装卡板', content: '卡板为上架状态，不可装卡板',
...@@ -176,8 +177,7 @@ Page({ ...@@ -176,8 +177,7 @@ Page({
}); });
return return
}else{ }else{
listArr = data.box_list||[]; listArr = res.data||[];
listArr
palletObj = { palletObj = {
pallet_sn:data.pallet_sn, pallet_sn:data.pallet_sn,
pallet_id:data.pallet_id, pallet_id:data.pallet_id,
...@@ -205,7 +205,7 @@ Page({ ...@@ -205,7 +205,7 @@ Page({
console.log(tableData) console.log(tableData)
let newData = []; let newData = [];
if(me.data.palletObj){ if(me.data.palletObj){
obj['pallet_id'] = me.data.palletObj.pallet_id obj['pallet_sn'] = me.data.palletObj.pallet_id
} }
for(let i=0;i<tableData.length;i++){ for(let i=0;i<tableData.length;i++){
let item = tableData[i]; let item = tableData[i];
......
pages/login/login.js
...@@ -51,7 +51,7 @@ Page({ ...@@ -51,7 +51,7 @@ Page({
if (res.errcode === 0) { if (res.errcode === 0) {
wx.setStorageSync( wx.setStorageSync(
"access_token",res.access_token); "access_token",res.access_token);
wx.redirectTo({ wx.reLaunch({
url: '/pages/home/home' url: '/pages/home/home'
}); });
} else { } else {
......
pages/mountingPlate/mountingPlate.js
...@@ -118,6 +118,7 @@ Page({ ...@@ -118,6 +118,7 @@ Page({
content: '箱号不存在', content: '箱号不存在',
showCancel: false showCancel: false
}); });
return
} }
arr.push({ arr.push({
...@@ -177,7 +178,6 @@ Page({ ...@@ -177,7 +178,6 @@ Page({
return return
}else{ }else{
listArr = data.box_list||[]; listArr = data.box_list||[];
listArr
palletObj = { palletObj = {
pallet_sn:data.pallet_sn, pallet_sn:data.pallet_sn,
pallet_id:data.pallet_id, pallet_id:data.pallet_id,
......
pages/receivinggoods/receivinggoods.js
...@@ -12,6 +12,7 @@ Page({ ...@@ -12,6 +12,7 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
commandData:["中国","中国台湾","马来西亚","日本","菲律宾","泰国","墨西哥","美国","韩国","以色列","德国","越南","印度尼西亚","新加坡","捷克","印度","哥斯达黎加","萨尔瓦多","法国","摩洛哥","英国","匈牙利","瑞士","爱尔兰"],
chooseOrder:null,//单个入仓号的数据 chooseOrder:null,//单个入仓号的数据
maskList:[],//弹窗的数据填充（选择入仓号） maskList:[],//弹窗的数据填充（选择入仓号）
isShowMask:false,//是否展示弹窗（入仓表格） isShowMask:false,//是否展示弹窗（入仓表格）
...@@ -550,6 +551,7 @@ onUnload:function(){ ...@@ -550,6 +551,7 @@ onUnload:function(){
let {value} = e.detail let {value} = e.detail
//获取弹窗数据（入仓） //获取弹窗数据（入仓）
let me = this; let me = this;
me.clearFun()
getData(apis.get_in_store_warehousing_sn, 'post', {"warehousing_sn":value}, function(res) { getData(apis.get_in_store_warehousing_sn, 'post', {"warehousing_sn":value}, function(res) {
if (res.errcode === 0) { if (res.errcode === 0) {
let data = res.data; let data = res.data;
...@@ -867,8 +869,27 @@ onUnload:function(){ ...@@ -867,8 +869,27 @@ onUnload:function(){
me.getReceivingList(1); me.getReceivingList(1);
if(me.data.formData.wldy == 1){ if(me.data.formData.wldy == 1){
console.log('打印数据') console.log('打印物料标签')
// me.initBlue(1,data) let formData = me.data.formData;
let data = "! 0 200 200 400 1 \n"+
"B QR 200 0 M 2 2 10 \n"+
"MA,QR code :"+formData.xh+","+formData.pp+","+formData.sl+","+formData.cd+","+(formData.dc||'--')+","+(formData.pc||'--')+"\n"+
"ENDQR \n"+
"TTEXT 55 1 380 0 型号 \n"+
"TEXT 55 1 380 40 品牌 \n"+
"TEXT 55 1 380 80 数量 \n"+
"TEXT 55 1 380 120 产地 \n"+
"TEXT 55 1 380 160 DC \n"+
"TEXT 55 1 380 200 批次 \n"+
"TEXT 55 1 480 0 "+formData.xh+" \n"+
"TEXT 55 1 480 40 "+formData.pp+" \n"+
"TEXT 55 1 480 80 "+formData.sl+" \n"+
"TEXT 55 1 480 120 "+formData.cd+" \n"+
"TEXT 55 1 480 160 "+(formData.dc||'--')+" \n"+
"TEXT 55 1 480 200 "+(formData.pc||'--')+" \n"+
"FORM \n"+
"PRINT";
me.initBlue(1,data)
} }
}else{ }else{
wx.showToast({ wx.showToast({
...@@ -1155,29 +1176,6 @@ onUnload:function(){ ...@@ -1155,29 +1176,6 @@ onUnload:function(){
}) })
}, },
saveSaleTask:function(e){ saveSaleTask:function(e){
let str = "! 0 200 200 400 1 \n"+
"B QR 200 0 M 2 2 10 \n"+
"MA,QR code :'1','2','3','4'\n"+
"ENDQR\n"+
"TEXT 55 1 380 20 卡板号: \n"+
"TEXT 55 1 380 60 内含箱数: \n"+
"TEXT 55 1 380 100 净重: \n"+
"TEXT 55 1 480 20 卡板号 \n"+
"TEXT 55 1 480 60 内含箱数 \n"+
"TEXT 55 1 480 100 净重 \n"+
"FORM \n"+
"PRINT\n"+"! 0 200 200 400 1 \n"+
"B QR 200 0 M 2 2 10 \n"+
"MA,QR code :'1','2','3','4'\n"+
"ENDQR\n"+
"TEXT 55 1 380 20 卡板号: \n"+
"TEXT 55 1 380 60 内含箱数: \n"+
"TEXT 55 1 380 100 净重: \n"+
"TEXT 55 1 480 20 卡板号 \n"+
"TEXT 55 1 480 60 内含箱数 \n"+
"TEXT 55 1 480 100 净重 \n"+
"FORM \n"+
"PRINT";
//type为1表示生成上架任务 type为2表示装箱 //type为1表示生成上架任务 type为2表示装箱
let {type} = e.currentTarget.dataset; let {type} = e.currentTarget.dataset;
let me = this; let me = this;
...@@ -1237,9 +1235,12 @@ onUnload:function(){ ...@@ -1237,9 +1235,12 @@ onUnload:function(){
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
me.getList1();
me.getReceivingList(1);
me.getReceivingList(2)
if(type == 2){ if(type == 2){
console.log('打印数据') console.log('打印箱标签')
me.initBlue(type,data) // me.initBlue(type,data)
} }
}else{ }else{
wx.showToast({ wx.showToast({
......
pages/receivinggoods/receivinggoods.wxml
...@@ -126,11 +126,11 @@ ...@@ -126,11 +126,11 @@
<text class="box-icon {{xiangIndex == 1 ?'checked':'' }}"></text> <text class="box-icon {{xiangIndex == 1 ?'checked':'' }}"></text>
<text>装新箱</text> <text>装新箱</text>
</view> </view>
<view class="Iflex checkBox aic" catchtap="changeXiangIndex" data-index="2"> <view class="Iflex checkBox aic" catchtap="changeXiangIndex" data-index="2">
<text class="box-icon {{xiangIndex == 2 ?'checked':'' }}"></text> <text class="box-icon {{xiangIndex == 2 ?'checked':'' }}"></text>
<text>合箱</text> <text>合箱</text>
</view> </view>
<input class="input input-border" value="{{orderNum}}" bindinput="formOrderNumInput"></input> <input class="input input-border" value="{{orderNum}}" bindinput="formOrderNumInput"></input>
</view> </view>
<view class="bottom-table-view Bflex"> <view class="bottom-table-view Bflex">
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<view class="td-2 td borderBox Iflex jcc aic"><text>{{item.goods_name}}</text></view> <view class="td-2 td borderBox Iflex jcc aic"><text>{{item.goods_name}}</text></view>
<view class="td-3 td borderBox Iflex jcc aic"><text>{{item.brand_name}}</text></view> <view class="td-3 td borderBox Iflex jcc aic"><text>{{item.brand_name}}</text></view>
<view class="td-4 td borderBox Iflex jcc aic"><text>{{item.number}}</text></view> <view class="td-4 td borderBox Iflex jcc aic"><text>{{item.number}}</text></view>
<view class="td-5 td borderBox Iflex jcc aic" catchtap="deleteReceiving" data-id="{{item.receiving_id}} "><text class="underline-text">清除</text></view> <view class="td-5 td borderBox Iflex jcc aic" catchtap="deleteReceiving" data-id="{{item.receiving_id}} "><text class="underline-text">清除</text></view>
</view> </view>
</block> </block>
...@@ -246,12 +246,7 @@ ...@@ -246,12 +246,7 @@
<text class="text">常用</text> <text class="text">常用</text>
</view> </view>
<view class="often-items clr"> <view class="often-items clr">
<text class="fl">中国</text> <text class="fl" wx:for="{{commandData}}" wx:key="index" data-country="{{item}}" catchtap="chooseCountry">{{item}}</text>
<text class="fl">中国台湾</text>
<text class="fl">中国</text>
<text class="fl">中国台湾</text>
<text class="fl">中国</text>
<text class="fl">中国台湾</text>
</view> </view>
</view> </view>
<view class="address-items" wx:if="{{countryList.length}}"> <view class="address-items" wx:if="{{countryList.length}}">
......
pages/startPage/startPage.js
...@@ -14,20 +14,20 @@ Page({ ...@@ -14,20 +14,20 @@ Page({
onLoad: function (options) { onLoad: function (options) {
if (this.data.token) { if (this.data.token) {
//登入 //登入
// wx.reLaunch({ wx.reLaunch({
// url: '/pages/home/home'
// });
wx.navigateTo({
url: '/pages/home/home' url: '/pages/home/home'
}); });
// wx.navigateTo({
// url: '/pages/home/home'
// });
}else{ }else{
//未登入 //未登入
// wx.reLaunch({ wx.reLaunch({
// url: '/pages/login/login'
// });
wx.navigateTo({
url: '/pages/login/login' url: '/pages/login/login'
}); });
// wx.navigateTo({
// url: '/pages/login/login'
// });
} }
}, },
......
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