Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_online_20240829
niexiting 5 months ago
parent
commit
8a30cc7cd3
  1. 4
      src/manifest.json
  2. 6
      src/mycomponents/detail/comDetailCard.vue
  3. 8
      src/mycomponents/detail/comJobDetailCard.vue
  4. 2
      src/mycomponents/package/packageCard.vue
  5. 2
      src/mycomponents/package/packageList.vue
  6. 2
      src/mycomponents/recommend/recommend.vue
  7. 2
      src/mycomponents/record/recordComDetailCard.vue
  8. 13
      src/mycomponents/scan/winScanPackAndLocation.vue
  9. 3
      src/pages/deliver/job/deliverDetail.vue
  10. 129
      src/pages/issue/record/directIssue.vue
  11. 557
      src/pages/issue/record/directIssue1.vue
  12. 1
      src/pages/issue/request/issueScanRequest.vue
  13. 2
      src/pages/login/index.vue
  14. 16
      src/pages/package/job/overPackageJobDetail.vue
  15. 28
      src/pages/package/record/overPackageRecord.vue
  16. 69
      src/pages/point/index.vue
  17. 26
      src/pages/pointProductReceipt/index.vue
  18. 11
      src/pages/productPutaway/job/productPutawayDetail.vue
  19. 6
      src/pages/productPutaway/record/productPutawayRecord.vue
  20. 25
      src/pages/productReceipt/job/fgProductReceiptDetail.vue
  21. 5
      src/pages/productReceipt/job/productReceiptDetail.vue
  22. 7
      src/pages/putaway/job/putawayDetail.vue
  23. 3
      src/pages/putaway/record/putawayRecord.vue

4
src/manifest.json

@ -2,8 +2,8 @@
"name" : "wms",
"appid" : "__UNI__C9CF4BF",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : 1,
"versionName" : "1.0.5",
"versionCode" : 5,
"transformPx" : false,
/* 5+App */
"app-plus" : {

6
src/mycomponents/detail/comDetailCard.vue

@ -13,7 +13,7 @@
<uni-swipe-action-item @click="swipeClick($event,item)"
:right-options="item.scaned?scanOptions:detailOptions"
style='padding:0px 0px 5px 0px;align-items: center;'>
<recommend :detail="item" :isShowToLocation="false">
<recommend :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false">
</recommend>
</uni-swipe-action-item>
</uni-swipe-action>
@ -74,6 +74,10 @@
type: Boolean,
default: true
},
isShowStatus: {
type: Boolean,
default: true
},
},
watch: {
dataContent: {

8
src/mycomponents/detail/comJobDetailCard.vue

@ -10,7 +10,7 @@
:isEdit="settingParam.allowModifyQty=='TRUE'"
:settingParam="settingParam"
@collapseChange="collapseChange"
@updateData="updateData"
@updateData="updateData" :isShowStatus="isShowStatus"
></package-list>
</uni-collapse-item>
</uni-collapse>
@ -60,8 +60,10 @@
type: Object,
default: null
},
isShowStatus: {
type: Boolean,
default: true
},
},
watch: {

2
src/mycomponents/package/packageCard.vue

@ -19,7 +19,7 @@
<recommend-qty v-if="dataContent.handleQty==null || dataContent.handleQty==undefined" :dataContent="dataContent"
:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false">
:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus">
</compare-qty>
<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">

2
src/mycomponents/package/packageList.vue

@ -5,7 +5,7 @@
<uni-collapse-item :disabled="false">
<template v-slot:title>
<package-card :dataContent="item" :isShowLocation="false"
:isShowFromLocation="isShowFromLocation"></package-card>
:isShowFromLocation="isShowFromLocation" :isShowStatus="isShowStatus"></package-card>
</template>
<view v-for="(pack,index) in item.packList" :key="pack.id"
style=" width: 100%; background-color: antiquewhite;">

2
src/mycomponents/recommend/recommend.vue

@ -18,7 +18,7 @@
<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
:handleQty="Number(detail.handleQty)" :isShowStdPack="false" :isShowStatus="isShowStatus">
</compare-qty>
<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">

2
src/mycomponents/record/recordComDetailCard.vue

@ -15,7 +15,7 @@
<uni-swipe-action >
<uni-swipe-action-item @click="swipeClick($event,detail,index)"
:right-options="detail.scaned?scanOptions:detailOptions">
<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="true"
<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="isShowStatus"
:isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation">
</balance>
</uni-swipe-action-item>

13
src/mycomponents/scan/winScanPackAndLocation.vue

@ -105,6 +105,10 @@
queryBalance: {
type: Boolean,
default: true
},
balanceFromInventoryStatuses:{//fromInventoryStatuses
type: Boolean,
default: true
}
},
data() {
@ -255,7 +259,8 @@
// title: '...',
// mask: true
// })
getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
// -- fromInventoryStatuses
getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined,
res => {
uni.hideLoading();
if (res.success) {
@ -279,7 +284,11 @@
if (this.allowNullBalance) {
this.allowNoneBalance(datas);
} else if (this.noShowBalanceMessage) {
this.countCallBack(datas);
if(Array.isArray(datas)){
this.countCallBack(datas[0]);
}else{
this.countCallBack(datas);
}
} else {
this.mustHavaBalance(datas);
}

3
src/pages/deliver/job/deliverDetail.vue

@ -247,6 +247,9 @@
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
if(params.subList.length==0){
this.$refs.comMessage.showSuccessMessage('请扫描箱码')
}
deliverJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {

129
src/pages/issue/record/directIssue.vue

@ -14,10 +14,12 @@
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<recordDetailCard :dataContent="item" :index="index" :settingParam="dataContent"
<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
:isShowFromLocation="false" @removeItem="removeItem(index,item)"
:isShowToLocation="false"
@updateData="updateData" @removePack="removePack">
</recordDetailCard>
</record-com-detail-card>
</view>
</view>
</scroll-view>
@ -75,7 +77,8 @@
getBusinessType,
createItemInfo,
createDetailInfo,
calcTreeHandleQty
calcTreeHandleQty,
calcHandleQty
} from '@/common/record.js';
import {
@ -170,6 +173,8 @@
let balance = result.balance;
let label = result.label;
let pack = result.package;
let packUnit = pack.packUnit;
let packQty =pack.packQty
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
@ -179,37 +184,36 @@
this.fromWarehouseCode = balance.warehouseCode;
}
if (item == undefined) {
//
// this.getRecommendLocation(balance, pack, toLocation => {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
// newDetail.toLocationCode = toLocation.code;
// newDetail.toWarehouseCode = toLocation.warehouseCode;
itemp.subList.push(newDetail);
var dataList = pack.subList
this.detailSource.push(itemp)
this.detailSource.forEach(res => {
res.subList.forEach(pack => {
pack.packList = dataList.filter(c => c.parentNumber == pack
.packingNumber)
pack.packList.forEach(pac => {
pac.parentPackingNumber = pac.parentNumber;
pac.packingNumber = pac.number;
pac.inventoryStatus = "OK";
pac.scaned = true;
})
})
})
// })
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
newDetail.packUnit =packUnit;
newDetail.packQty=packQty;
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
calcHandleQty(this.detailSource);
} else {
var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
balance.batch);
if (itemDetail != undefined) {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
var detail = item.subList.find(r => {
if (r.packingNumber == balance.packingNumber &&
r.batch == balance.batch &&
r.locationCode == balance.locationCode &&
r.inventoryStatus == balance.inventoryStatus) {
return r;
}
})
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
newDetail.packUnit =packUnit;
newDetail.packQty=packQty;
item.subList.push(newDetail);
calcHandleQty(this.detailSource);
} else {
if (detail.scaned == true) {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
}
}
}
// calcTreeHandleQty(this.detailSource);
},
//
@ -318,12 +322,6 @@
},
updateData() {
this.calcTreeHandleQty();
},
removeItem(index, item) {
this.detailSource.splice(index, 1)
},
@ -403,38 +401,6 @@
});
},
getItemAndLocationRelations() {
var itemList = []
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
detail.toLocationCode = this.toLocationCode;
var filterResult = itemList.filter(res => {
if (res.itemCode == item.itemCode &&
res.locationCode == detail.toLocationCode &&
res.batch == detail.batch &&
res.inventoryStatus == detail.inventoryStatus) {
return res
}
})
//
if (filterResult.length == 0) {
var result = {
itemCode: item.itemCode,
locationCode: detail.toLocationCode,
batch: detail.batch,
inventoryStatus: detail.inventoryStatus,
}
itemList.push(result)
}
}
})
})
return itemList;
},
setRecordParams() {
var subList = []
var creator = this.$store.state.user.id
@ -467,7 +433,11 @@
toBatch:info.batch,
fromLocationCode:detail.locationCode,
toLocationCode:detail.toLocationCode,
handleQty:detail.handleQty
handleQty:detail.handleQty,
fromPackUnit:detail.packUnit,
toPackUnit:detail.packUnit,
fromPackQty:detail.packQty,
toPackQty:detail.packQty
}
]
subList.push(submitItem)
@ -532,15 +502,17 @@
})
},
updateData() {
// this.calcTreeHandleQty();
for (var i = 0; i < this.detailSource.length; i++) {
let item = this.detailSource[i];
if (item.qty == 0) {
this.detailSource.splice(i, 1)
}
updateData() {
calcHandleQty(this.detailSource);
for (var i = 0; i < this.detailSource.length; i++) {
let item = this.detailSource[i];
if (item.qty == 0) {
this.detailSource.splice(i, 1)
}
},
}
this.$forceUpdate();
},
clearData() {
this.fromLocationInfo = {};
@ -548,6 +520,7 @@
this.fromWarehouseCode = '';
this.toWarehouseCode = '';
this.detailSource = [];
this.to
}
}
}

557
src/pages/issue/record/directIssue1.vue

@ -0,0 +1,557 @@
<template>
<view class="page-wraper">
<view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view>
<view class="page-wraper" v-if="detailSource.length>0">
<view class="page-header">
<view class="header_item">
来源库位 : {{fromLocationCode}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<recordDetailCard :dataContent="item" :index="index" :settingParam="dataContent"
:isShowFromLocation="false" @removeItem="removeItem(index,item)"
@updateData="updateData" @removePack="removePack">
</recordDetailCard>
</view>
</view>
</scroll-view>
</view>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="uni-row uni-flex">
<text>生产线:</text>
<view class="uni-flex u-col-center uni-row" @click="showSelect">
<view class="" style="margin-left: 20rpx;">
{{positionInfo}}
</view>
<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
@confirm="confirmSelect"></u-select>
</view>
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
</view>
</view>
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
</view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
</win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view>
</template>
<script>
import {
issueRecordSubmit,
getWorkShopLineStation,
} from '@/api/request2.js';
import {
goHome,
getPackingNumberAndBatchByList,
deepCopyData
} from '@/common/basic.js';
import {
calc
} from '@/common/calc.js';
import {
getInventoryStatusDesc,
getDirectoryItemArray
} from '@/common/directory.js';
import {
getBusinessType,
createItemInfo,
createDetailInfo,
calcTreeHandleQty
} from '@/common/record.js';
import {
getManagementPrecisions,
getPrecisionStrategyList,
getPrecisionStrategyParams
} from '@/common/balance.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
export default {
components: {
winScanButton,
winScanPack,
requiredLocation,
comBlankView,
winScanLocation,
winScanPackAndLocation,
recordComDetailCard,
recordDetailCard
},
data() {
return {
id: '',
dataContent: {}, //
detailSource: [], //
fromLocationInfo: {},
fromLocationCode: "",
fromLocationAreaTypeList: [],
toLocationAreaTypeList: [],
inInventoryStatus: "", //
outInventoryStatus: "", //
businessType: {},
showToLoaction: true,
recommendLocationList: [], //
fromWarehouseCode: '', //
businessTypeCode: "Issue",
positionList: [],
show: false,
positionInfo: "请选择生产线"
};
},
onLoad(option) {
this.clearData();
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
this.businessType = res.businessType;
this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
this.toLocationAreaTypeList = res.toLocationAreaTypeList;
this.showFromLocationPopup();
} else {
this.showErrorMessage(res.message)
}
});
// if (this.positionList.length == 0) {
getWorkShopLineStation().then(res => {
if (res.data != null && res.data.length > 0) {
this.positionList = res.data
} else {
this.showErrorMessage('未查找到位置信息');
}
}).catch(error => {
this.showErrorMessage(error);
})
// }
},
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}
},
//
onBackPress(e) {},
onPullDownRefresh() {},
mounted() {},
methods: {
getScanResult(result) {
let balance = result.balance;
let label = result.label;
let pack = result.package;
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
}
})
if (this.fromWarehouseCode == '') {
this.fromWarehouseCode = balance.warehouseCode;
}
if (item == undefined) {
//
// this.getRecommendLocation(balance, pack, toLocation => {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
// newDetail.toLocationCode = toLocation.code;
// newDetail.toWarehouseCode = toLocation.warehouseCode;
itemp.subList.push(newDetail);
var dataList = pack.subList
this.detailSource.push(itemp)
this.detailSource.forEach(res => {
res.subList.forEach(pack => {
pack.packList = dataList.filter(c => c.parentNumber == pack
.packingNumber)
pack.packList.forEach(pac => {
pac.parentPackingNumber = pac.parentNumber;
pac.packingNumber = pac.number;
pac.inventoryStatus = "OK";
pac.scaned = true;
})
})
})
// })
} else {
var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
balance.batch);
if (itemDetail != undefined) {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
}
}
// calcTreeHandleQty(this.detailSource);
},
//
getRecommendLocation(balance, pack, callback) {
uni.showLoading({
title: '扫描中...',
mask: true
})
let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
if (recommend == undefined) {
let param = {
itemCode: balance.itemCode,
batch: balance.batch,
inventoryStatus: balance.inventoryStatus,
supplierCode: pack.supplierCode,
businessCode: this.businessTypeCode
};
console.log(JSON.stringify(param))
getPutawayRecommendLocation(param).then(res => {
this.recommendLocationList.push({
itemCode: balance.itemCode,
locationCode: res.data.code
})
callback(res.data);
uni.hideLoading();
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error);
uni.hideLoading();
})
} else {
callback(recommend);
}
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {}
});
},
calcTreeHandleQty() {
for (let item of this.detailSource) {
item.qty = 0;
for (let detail of item.subList) {
if (detail != undefined) {
item.qty = calc.add(item.qty, detail.qty)
}
}
}
this.$forceUpdate();
},
showSelect() {
// if (this.editPosition) {
this.show = true
// }
},
confirmSelect(e) {
this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
console.log("位置", this.positionInfo)
this.workshopCode = e[0].value
this.productionLineCode = e[1].value
this.workStationCode = e[2].value
this.workShopName = e[0].label
this.productionLineName = e[1].label
this.workStationName = e[2].label
let shop = this.positionList.find(shop => shop.value == this.workshopCode);
if (shop != undefined && shop.children != undefined) {
let prodLine = shop.children.find(line => line.value == this.productionLineCode);
if (prodLine != undefined && prodLine.children != undefined) {
let station = prodLine.children.find(r => r.value == this.workStationCode);
if (station.rawLocationCode == '' && station.rawLocationCode == null) {
this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
return;
} else {
this.rawLocationCode = station.rawLocationCode;
this.fgLocationCode = station.fgLocationCode;
}
} else {
this.showErrorMessage("生产线-工位基础信息维护错误")
}
} else {
this.showErrorMessage("车间-生产线基础信息维护错误")
}
//
let toLocationCode = ''
this.positionList.forEach(item=>{
if(this.workshopCode == item.value){ //
item.children.find(child=>{
if(this.productionLineCode==child.value){
toLocationCode = child.children.find(subChild=>this.workStationCode==subChild.value).rawLocationCode;
}
})
}
})
this.detailSource.forEach(item=>{
item.subList.forEach(detail => {
detail.toLocationCode = toLocationCode
})
})
},
updateData() {
this.calcTreeHandleQty();
},
removeItem(index, item) {
this.detailSource.splice(index, 1)
},
removePack() {
for (var i = 0; i < this.detailSource.length; i++) {
var item = this.detailSource[i];
if (item.subList.length == 0) {
this.detailSource.splice(i, 1)
}
}
this.updateData();
},
openScanPopup() {
if (this.fromLocationCode == "") {
this.showFromLocationPopup();
return
}
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
},
showFromLocationPopup() {
this.$nextTick(() => {
this.$refs.scanLocationCode.openScanPopup();
})
},
closeScanPopup() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
},
scanPopupGetFocus() {
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
},
// scanLocationCode(location, code) {
// this.toLocationCode = code
// this.toLocationCode = location;
// },
commit() {
uni.showLoading({
title: "提交中....",
mask: true
});
//
let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
//2:
getPrecisionStrategyList(precisionStrategyParams, res => {
if (res.success) {
this.managementList = res.list;
var params = {...this.setRecordParams()}
console.log("提交参数", JSON.stringify(params));
issueRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成直接发料记录<br>" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
} else {
uni.hideLoading();
this.showErrorMessage(res.message);
}
});
},
getItemAndLocationRelations() {
var itemList = []
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
detail.toLocationCode = this.toLocationCode;
var filterResult = itemList.filter(res => {
if (res.itemCode == item.itemCode &&
res.locationCode == detail.toLocationCode &&
res.batch == detail.batch &&
res.inventoryStatus == detail.inventoryStatus) {
return res
}
})
//
if (filterResult.length == 0) {
var result = {
itemCode: item.itemCode,
locationCode: detail.toLocationCode,
batch: detail.batch,
inventoryStatus: detail.inventoryStatus,
}
itemList.push(result)
}
}
})
})
return itemList;
},
setRecordParams() {
var subList = []
var creator = this.$store.state.user.id
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch);
var submitItem = deepCopyData(detail)
submitItem.toPackingNumber = info.packingNumber;
submitItem.toBatch = info.batch;
submitItem.toContainerNumber = detail.containerNumber;
submitItem.fromPackingNumber = info.packingNumber;
submitItem.fromBatch = info.batch;
submitItem.fromContainerNumber = detail.containerNumber;
submitItem.fromLocationCode = detail.locationCode;
submitItem.toLocationCode = detail.toLocationCode;
// detail.toInventoryStatus = detail.inventoryStatus
// detail.toLocationCode = detail.toLocationCode
submitItem.qty = detail.handleQty;
submitItem.package = "";
submitItem.recordList = [{
toInventoryStatus:detail.inventoryStatus,
fromPackingNumber:info.packingNumber,
fromBatch:info.batch,
toPackingNumber:info.packingNumber,
toBatch:info.batch,
fromLocationCode:detail.locationCode,
toLocationCode:detail.toLocationCode,
handleQty:detail.handleQty
}
]
subList.push(submitItem)
}
})
})
if (subList.length > 0) {
this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
}
this.dataContent.subList = subList
this.dataContent.creator = creator;
this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
return this.dataContent;
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {}
});
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
}
});
},
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message);
},
afterCloseMessage() {
this.scanPopupGetFocus();
},
closeScanMessage() {
this.scanPopupGetFocus();
},
getLocation(location, code) {
this.getFromLocationCode(location, code)
},
getFromLocationCode(location, code) {
this.fromLocationInfo = location;
this.fromLocationCode = code;
this.openScanPopup();
},
getToLocationCode(location, code) {
if (this.fromLocationCode == code) {
uni.showToast({
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
duration: 2000
})
return
}
this.toLocationCode = code;
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
this.clearData();
})
},
updateData() {
// this.calcTreeHandleQty();
for (var i = 0; i < this.detailSource.length; i++) {
let item = this.detailSource[i];
if (item.qty == 0) {
this.detailSource.splice(i, 1)
}
}
},
clearData() {
this.fromLocationInfo = {};
this.fromLocationCode = '';
this.fromWarehouseCode = '';
this.toWarehouseCode = '';
this.detailSource = [];
}
}
}
</script>
<style scoped lang="scss">
</style>

1
src/pages/issue/request/issueScanRequest.vue

@ -108,6 +108,7 @@
setParams() {
this.detailSource.dueTime = getCurrDateOneMonthsTimes();
this.detailSource.isCallMaterialsLabel = "TRUE";
return this.detailSource
},
submit() {

2
src/pages/login/index.vue

@ -124,7 +124,7 @@
uni.clearStorage(); //
if (process.env.NODE_ENV === 'development') {
this.username = "admin"
this.password = "123456";
this.password = "win123456";
}
uni.setNavigationBarColor({
frontColor: '#ffffff',

16
src/pages/package/job/overPackageJobDetail.vue

@ -332,15 +332,19 @@
let list = [];
res.data.forEach(item => {
list.push({
itemNumber: item.itemCode, //
itemCode:item.itemCode, //
itemName: item.itemName, //
referenceOrderRow: item.poLine, //
referenceOrderCode: item.poNumber, //
supplierCode: item.supplierCode, //
packName: item.packName,//
packageCode: item.number, //
amount: item.qty, //
batch:item.batch,//
parentNumber:item.parentNumber,//
itemType:item.itemType,//
asnNumber:item.asnNumber,//ASN
supplierCode: item.supplierCode, //
qty: item.qty, //
printTimes:getCurrDateTime(), //
barcodeString: item.barcodeString, //
barcodeBase64: ''
barcodeBase64: '',
})
})
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)

28
src/pages/package/record/overPackageRecord.vue

@ -342,7 +342,25 @@
overPackageRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>" + res.data)
let list = []
res.data.forEach(item => {
list.push({
itemCode:item.itemCode, //
itemName: item.itemName, //
packName: item.packName,//
packageCode: item.toPackingNumber, //
batch:item.batch,//
parentNumber:item.parentNumber,//
itemType: item.itemType,//
asnNumber:item.asnNumber,//ASN
supplierCode: item.supplierCode, //
qty: item.qty, //
printTimes:item.printTimes, //
barcodeString: item.barcodeString, //
barcodeBase64: '',
})
})
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@ -414,12 +432,18 @@
this.fromLocationCode = code;
this.openScanPopup();
},
showCommitSuccessMessage(hint) {
showCommitSuccessMessage(hint,pointData) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
this.detailSource = []
this.fromLocationCode = '';
this.dataContent = {}
if (pointData.length > 0) {
uni.navigateTo({
url: `/pages/point/index?points=${JSON.stringify(pointData)}`
});
}
})
},

69
src/pages/point/index.vue

@ -5,36 +5,53 @@
<view class="left">
<view class="left-item">
<view class="label">物品代码</view>
<view class="value" id="name1">{{item.itemNumber}}</view>
<view class="value" id="name1">{{item.itemCode}}</view>
</view>
<view class="left-item">
<view class="label">物品名称</view>
<view class="value" id="name2">{{item.itemName}}</view>
</view>
<view class="left-item">
<view class="label">供应商</view>
<view class="value">{{item.supplierCode}}</view>
<view class="label">包装名称</view>
<view class="value">{{item.packName}}</view>
</view>
<view class="left-item">
<view class="label">包装号</view>
<view class="value">{{item.packageCode}}</view>
</view>
<view class="left-item">
<view class="label">订单行</view>
<view class="value">{{item.referenceOrderRow}}</view>
<view class="label">父包装号</view>
<view class="value">{{item.parentNumber}}</view>
</view>
<view class="left-item">
<view class="label">ASN</view>
<view class="value">{{item.asnNumber}}</view>
</view>
<view class="left-item">
<view class="label">数量</view>
<view class="value">{{item.qty}}</view>
</view>
</view>
<view class="right">
<view class="image">
<l-qrcode ref="qrcodeRef" :value="item.barcodeString" size="300rpx"></l-qrcode>
</view>
<view class="left-item">
<view class="label">订单号</view>
<view class="value">{{item.referenceOrderCode}}</view>
<view class="label">批次</view>
<view class="value">{{item.batch}}</view>
</view>
<view class="left-item">
<view class="label">数量</view>
<view class="value">{{item.amount}}</view>
<view class="label">物料类型</view>
<view class="value">{{item.itemType}}</view>
</view>
<view class="left-item">
<view class="label">供应商</view>
<view class="value">{{item.supplierCode}}</view>
</view>
<view class="left-item">
<view class="label">打印时间</view>
<view class="value">{{item.printTimes}}</view>
</view>
</view>
</view>
@ -102,23 +119,31 @@
<div class="left">
<div class="left-item">
<div class="label">物品代码</div>
<div class="value" id="name1">${item.itemNumber}</div>
<div class="value" id="name1">${item.itemCode}</div>
</div>
<div class="left-item">
<div class="label">物品名称</div>
<div class="value" id="name2">${item.itemName}</div>
</div>
<div class="left-item">
<div class="label">供应商</div>
<div class="value">${item.supplierCode}</div>
<div class="label">包装名称</div>
<div class="value">${item.packName}</div>
</div>
<div class="left-item">
<div class="label">包装号</div>
<div class="value">${item.packageCode}</div>
</div>
<div class="left-item">
<div class="label">订单行</div>
<div class="value">${item.referenceOrderRow}</div>
<div class="label">父包装号</div>
<div class="value">${item.parentNumber}</div>
</div>
<div class="left-item">
<div class="label">ASN</div>
<div class="value">${item.asnNumber}</div>
</div>
<div class="left-item">
<div class="label">数量</div>
<div class="value">${item.qty}</div>
</div>
</div>
<div class="right">
@ -126,12 +151,20 @@
<img id='image1' src="${item.barcodeBase64}" alt="" />
</div>
<div class="left-item">
<div class="label">订单号</div>
<div class="value">${item.referenceOrderRow}</div>
<div class="label">批次</div>
<div class="value">${item.batch}</div>
</div>
<div class="left-item">
<div class="label">数量</div>
<div class="value">${item.amount}</div>
<div class="label">物料类型</div>
<div class="value">${item.itemType}</div>
</div>
<div class="left-item">
<div class="label">供应商</div>
<div class="value">${item.supplierCode}</div>
</div>
<div class="left-item">
<div class="label">打印时间</div>
<div class="value">${item.printTimes}</div>
</div>
</div>
</div>`

26
src/pages/pointProductReceipt/index.vue

@ -12,8 +12,8 @@
<view class="value" id="name2">{{item.itemName}}</view>
</view>
<view class="left-item">
<view class="label">物料描述</view>
<view class="value">{{item.itemDesc1}}</view>
<view class="label">包装名称</view>
<view class="value">{{item.packName}}</view>
</view>
<view class="left-item">
<view class="label">包装号</view>
@ -37,8 +37,8 @@
<view class="value">{{item.batch}}</view>
</view>
<view class="left-item">
<view class="label">班次</view>
<view class="value">{{item.shiftCode}}</view>
<view class="label">物料类型</view>
<view class="value">{{item.itemType}}</view>
</view>
<view class="left-item" >
<view class="label">打印时间</view>
@ -117,20 +117,20 @@
<div class="value" id="name2">${item.itemName}</div>
</div>
<view class="left-item">
<view class="label">物料描述</view>
<view class="value">{{item.itemDesc1}}</view>
<view class="label">包装名称</view>
<view class="value">${item.packName}</view>
</view>
<view class="left-item">
<view class="label">包装号</view>
<view class="value">{{item.relateNumber}}</view>
<view class="value">${item.relateNumber}</view>
</view>
<view class="left-item">
<view class="label">生产线</view>
<view class="value">{{item.productionLineCode}}</view>
<view class="value">${item.productionLineCode}</view>
</view>
<view class="left-item">
<view class="label">数量</view>
<view class="value">{{item.qty}}</view>
<view class="value">${item.qty}</view>
</view>
</div>
<div class="right">
@ -139,15 +139,15 @@
</div>
<view class="left-item">
<view class="label">批次</view>
<view class="value">{{item.batch}}</view>
<view class="value">${item.batch}</view>
</view>
<view class="left-item">
<view class="label">班次</view>
<view class="value">{{item.shiftCode}}</view>
<view class="label">物料类型</view>
<view class="value">${item.itemType}</view>
</view>
<view class="left-item">
<view class="label">打印时间</view>
<view class="value">{{item.printTimes}}</view>
<view class="value">${item.printTimes}</view>
</view>
</div>
</div>`

11
src/pages/productPutaway/job/productPutawayDetail.vue

@ -13,8 +13,8 @@
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" @openDetail="openDetail"
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
@remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card>
</view>
@ -36,7 +36,7 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
@ -202,7 +202,10 @@
that.detailSource.forEach(r => {
r.subList.forEach(s => {
if (this.scanedPackingNumber && this.scanedPackingNumber == s
.packingNumber) s.scaned = true
.packingNumber) {
s.scaned = true
s.handleQty =s.qty
}
})
})
that.isCheckLocation = getSwitchInfoByCode(that.switchCode)

6
src/pages/productPutaway/record/productPutawayRecord.vue

@ -9,7 +9,7 @@
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent" :isShowStatus="false"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card>
</view>
@ -33,7 +33,7 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button>
</view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<comMessage ref="comMessage"></comMessage>
@ -153,6 +153,7 @@
if (item == undefined) {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
newDetail.fromInventoryStatus = balance.inventoryStatus;
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
@ -166,6 +167,7 @@
})
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
newDetail.fromInventoryStatus = balance.inventoryStatus;
item.subList.push(newDetail);
} else {
if (detail.scaned == true) {

25
src/pages/productReceipt/job/fgProductReceiptDetail.vue

@ -70,6 +70,7 @@
import {
getManagementPrecisions
} from '@/common/balance.js';
import { getCurrDateTime} from '@/common/basic.js';
import {
getProductReceiptJobDetail,
@ -377,17 +378,19 @@
console.log('打印', res)
let pointData = []
res.data.forEach(item => {
pointData.push({
barcodeString: item.barcodeString, //
itemCode: item.itemCode || '', //
itemName: item.itemName || '', //
itemDesc1: item.itemDesc1 || '', //
relateNumber: item.relateNumber || '', //relateNumber
batch: item.batch || '', //
productionLineCode: item.productionLineCode || '', //线
shiftCode: item.shiftCode || '', //
qty: item.qty || '', //
printTimes: item.printTimes || '' //
pointData.push({
barcodeString: item.barcodeString, //
itemCode: item.itemCode || '', //
itemName: item.itemName || '', //
packName: item.packName || '', //
itemType: item.itemType || '', //
itemDesc1: item.itemDesc1 || '', //
relateNumber: item.relateNumber || '', //relateNumber
batch: item.batch || '', //
productionLineCode: item.productionLineCode || '', //线
shiftCode: item.shiftCode || '', //
qty: item.qty || '', //
printTimes: getCurrDateTime() //
})
})
console.log('pointData', pointData)

5
src/pages/productReceipt/job/productReceiptDetail.vue

@ -222,7 +222,10 @@
that.detailSource.forEach(r => {
r.subList.forEach(s => {
if (this.scanedPackingNumber && this.scanedPackingNumber == s
.packingNumber) s.scaned = true
.packingNumber){
s.scaned = true
s.handleQty =s.qty
}
})
})
} else {

7
src/pages/putaway/job/putawayDetail.vue

@ -14,7 +14,7 @@
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
@remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</comJobDetailCard>
@ -41,7 +41,7 @@
<!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
</winScanPackAndLocationNoBalance> -->
<winScanPackAndLocation ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
</winScanPackAndLocation>
<comMessage ref="comMessage"></comMessage>
@ -345,6 +345,9 @@
scanedLength++;
}
})
//
itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {

3
src/pages/putaway/record/putawayRecord.vue

@ -172,6 +172,7 @@
newDetail.poLine=poLine;
newDetail.poNumber=poNumber;
newDetail.supplierCode=supplierCode;
newDetail.fromInventoryStatus = balance.inventoryStatus;
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
@ -195,6 +196,8 @@
newDetail.poLine=poLine;
newDetail.poNumber=poNumber;
newDetail.supplierCode=supplierCode;
newDetail.fromInventoryStatus = balance.inventoryStatus;
item.subList.push(newDetail);
calcHandleQty(this.detailSource);
});

Loading…
Cancel
Save