lijuncheng 11 months ago
parent
commit
28822e4351
  1. 15
      api/request2.js
  2. 2
      mycomponents/balance/moveStatus.vue
  3. 89
      pages/inventoryMove/coms/comMove.vue
  4. 7
      pages/inventoryMove/coms/comMovebalance.vue
  5. 2
      pages/inventoryMove/record/okToHoldRecord.vue
  6. 5
      static/menus/production_receipt.svg

15
api/request2.js

@ -223,6 +223,21 @@ export function getContainerByNumber(number) {
});
}
/**
* 查询器具信息接口
* @param {*} number 器具代码
*/
export function getContainerDetailByNumber(number) {
return request({
url: baseApi + "/wms/container-main/getContainerByNumber?number=" + number,
method: "get",
data: {},
});
}
/**
* 按器具查询库存明细
* @param {*器具代码}

2
mycomponents/balance/moveStatus.vue

@ -4,7 +4,7 @@
{{statusDesc(fromInventoryStatus)}}
</view>
->
>
<view :class="statusStyle(toInventoryStatus)">
{{statusDesc(toInventoryStatus)}}

89
pages/inventoryMove/coms/comMove.vue

@ -11,7 +11,7 @@
<view class="">
<com-move-record :dataContent="item" :index="index" @removeData="removeData"
:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
:allowEditStatus ="allowEditStatus">
:allowEditStatus="allowEditStatus">
</com-move-record>
</view>
<u-line />
@ -24,7 +24,7 @@
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="toLocationTypeArray"></requiredLocation>
:locationTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation>
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -33,7 +33,8 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
</view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'"></win-scan-pack-and-location>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
</win-scan-pack-and-location>
<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location>
<com-message ref="comMessage"></com-message>
@ -100,24 +101,27 @@
type: Boolean,
default: false
},
businessTypeCode: {
type: String,
default: "Move"
} //
}, //
toLocationCode: {
type: String,
default: ""
},
},
data() {
return {
fromLocationCode: "",
toLocationCode: "",
// toLocationCode: "",
toLocationInfo: {},
toLocationTypeArray: [],
toInventoryStatus: "",
businessType: {}, //
detailSource: [], //
title:"",
dataContent:{},
toWarehouseCode:"",
title: "",
dataContent: {},
toWarehouseCode: "",
fromlocationTypeList: [],
tolocationTypeList: [],
}
@ -143,24 +147,24 @@
methods: {
updateTitle() {
if(this.businessTypeCode=="InventoryMove"){
if (this.businessTypeCode == "InventoryMove") {
this.title = "库存转移记录";
this.toInventoryStatus = "OK"
}else if(this.businessTypeCode=="HoldToOk"){
this.title = "隔离转合格记录";
this.toInventoryStatus = "OK"
}else if(this.businessTypeCode=="HoldToScrap"){
this.title = "隔离转报废记录";
this.toInventoryStatus = "SCRAP"
}else if(this.businessTypeCode=="OkToHold"){
this.title = "合格转隔离记录";
this.toInventoryStatus ="HOLD"
}else if(this.businessTypeCode=="OktoScrap"){
this.title = "合格转报废记录";
this.toInventoryStatus ="SCRAP"
}else if(this.businessTypeCode=="ScrapToHold"){
this.title = "报废转隔离记录";
this.toInventoryStatus ="HOLD"
this.toInventoryStatus = "OK"
} else if (this.businessTypeCode == "HoldToOk") {
this.title = "隔离转合格记录";
this.toInventoryStatus = "OK"
} else if (this.businessTypeCode == "HoldToScrap") {
this.title = "隔离转报废记录";
this.toInventoryStatus = "SCRAP"
} else if (this.businessTypeCode == "OkToHold") {
this.title = "合格转隔离记录";
this.toInventoryStatus = "HOLD"
} else if (this.businessTypeCode == "OktoScrap") {
this.title = "合格转报废记录";
this.toInventoryStatus = "SCRAP"
} else if (this.businessTypeCode == "ScrapToHold") {
this.title = "报废转隔离记录";
this.toInventoryStatus = "HOLD"
}
uni.setNavigationBarTitle({
title: this.title
@ -203,10 +207,10 @@
}
})
if (item == undefined) {
var itemp = createItemInfo(balance,pack);
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
newDetail.inventoryStatus =balance.inventoryStatus;
newDetail.toInventoryStatus =this.toInventoryStatus
newDetail.inventoryStatus = balance.inventoryStatus;
newDetail.toInventoryStatus = this.toInventoryStatus
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
@ -223,7 +227,7 @@
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
newDetail.inventoryStatus = balance.inventoryStatus;
newDetail.toInventoryStatus =this.toInventoryStatus
newDetail.toInventoryStatus = this.toInventoryStatus
item.subList.push(newDetail);
} else {
this.showErrorMessage(balance.packingNumber + "已经在列表中")
@ -274,7 +278,7 @@
this.clearData()
})
},
clearData(){
clearData() {
this.fromLocationCode = '';
this.subList = [];
this.detailSource = [];
@ -302,17 +306,18 @@
this.managementList = res.list;
var params = this.setParams()
console.log("提交" + JSON.stringify(params))
inventoryMoveRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成"+this.title+"记录<br>" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
inventoryMoveRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成" + this.title + "记录<br>" +
res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
} else {
uni.hideLoading();

7
pages/inventoryMove/coms/comMovebalance.vue

@ -18,6 +18,9 @@
<moveStatus v-if="dataContent.inventoryStatus!=dataContent.toInventoryStatus"
:fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
</moveStatus>
<status :status='fromInventoryStatus'></status>
</view>
<!-- <view class="" v-if="isDevlement()">
<view class="" style="font-size: 40rpx;">
@ -44,6 +47,7 @@
import compareQty from '@/mycomponents/qty/compareQty.vue'
import moveStatus from '@/mycomponents/balance/moveStatus.vue'
import purchaseInfo from '@/mycomponents/purchase/purchaseInfo.vue'
import status from '@/mycomponents/status/status.vue'
export default {
components: {
@ -54,7 +58,8 @@
recommendQty,
compareQty,
moveStatus,
purchaseInfo
purchaseInfo,
status
},
data() {

2
pages/inventoryMove/record/okToHoldRecord.vue

@ -1,6 +1,6 @@
<template>
<view class="page-wraper">
<comMove businessTypeCode='OkToHold' > </comMove>
<comMove businessTypeCode='OkToHold' toLocationCode="HOLD" > </comMove>
</view>
</template>

5
static/menus/production_receipt.svg

@ -0,0 +1,5 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg t="1703487001565" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21325" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128">
<path d="M664 240h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM664 384h-400a24 24 0 0 0 0 48h400a24 24 0 0 0 0-48zM504 528h-240a24 24 0 0 0 0 48h240a24 24 0 0 0 0-48z" fill="#3c9cff" p-id="21326"></path>
<path d="M800 128v392a24 24 0 0 1-48 0V128a16 16 0 0 0-16-16H192a16 16 0 0 0-16 16v704a16 16 0 0 0 16 16h328a24 24 0 0 1 0 48h-432a24 24 0 0 1 0-48h42.08A58.56 58.56 0 0 1 128 832V128a64 64 0 0 1 64-64h544a64 64 0 0 1 64 64z" fill="#3c9cff" p-id="21327"></path><path d="M768 925.12a160 160 0 1 1 160-160 160 160 0 0 1-160 160m0 32a192 192 0 1 0-192-192 192 192 0 0 0 192 192z" fill="#3c9cff" p-id="21328"></path><path d="M864 736.8H672a16 16 0 0 0-11.2 4.64 16 16 0 0 0-3.36 5.12 16 16 0 0 0 0 12.32 16 16 0 0 0 3.36 5.12l57.44 57.44a16 16 0 0 0 22.56 0 16 16 0 0 0 0-22.72l-30.08-30.08H864a16 16 0 0 0 0-32z" fill="#3c9cff" p-id="21329"></path></svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save