代码更新:

1. 修复备料
This commit is contained in:
梁州 2024-08-29 19:15:55 +08:00
parent 7f549769f0
commit 9bd3dad1ee
6 changed files with 38 additions and 29 deletions

View File

@ -300,8 +300,10 @@ export default {
this.workFormEntity.NumOfBoxOf811 = response.returnData.NumOfBoxOf811 this.workFormEntity.NumOfBoxOf811 = response.returnData.NumOfBoxOf811
this.workFormEntity.NumOfBoxOf911 = response.returnData.NumOfBoxOf911 this.workFormEntity.NumOfBoxOf911 = response.returnData.NumOfBoxOf911
this.workFormEntity.NumOfBoxOf822 = response.returnData.NumOfBoxOf822 this.workFormEntity.NumOfBoxOf822 = response.returnData.NumOfBoxOf822
ElMessage.success("获取CLC看板需求成功。")
} else { } else {
this.resetForms() this.resetForms()
ElMessage.error(response.message)
} }
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)

View File

@ -24,12 +24,6 @@
label-width="150px" style="max-width: 100%" :rules="rules" status-icon> label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
<div style="display: flex;"> <div style="display: flex;">
<div style="display: block; margin: 5px;"> <div style="display: block; margin: 5px;">
<!-- <div
style="display: inline-flex; justify-content: center; height: 60px; width: 700px; margin: 5px; padding: 5px; background-color: #00AAE8;">
<span style="align-self: center; font-weight: bold;font-size: 25px;">
{{ workFormEntity.tip }}
</span>
</div> -->
<div style="display: flex;"> <div style="display: flex;">
<div style="display: flex; flex-direction: column;"> <div style="display: flex; flex-direction: column;">
<div class="display-title-div"> <div class="display-title-div">

View File

@ -24,12 +24,10 @@
label-width="150px" style="max-width: 100%" :rules="rules" status-icon> label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
<div style="display: flex;"> <div style="display: flex;">
<div style="display: block; margin: 5px;"> <div style="display: block; margin: 5px;">
<!-- <div <el-dialog v-model="dialogVisible" title="提醒" width="40%" draggable
style="display: inline-flex; justify-content: center; height: 60px; width: 700px; margin: 5px; padding: 5px; background-color: #00AAE8;"> :show-close="true">
<span style="align-self: center; font-weight: bold;font-size: 25px;"> <span style="color: green; margin-right: 16px; font-size: 35px;"> {{ workFormEntity.tip }}</span>
{{ workFormEntity.tip }} </el-dialog>
</span>
</div> -->
<div style="display: flex;"> <div style="display: flex;">
<div style="display: flex; flex-direction: column;"> <div style="display: flex; flex-direction: column;">
<div class="display-title-div"> <div class="display-title-div">
@ -173,6 +171,7 @@ export default {
{ required: true, message: '请输入料号' } { required: true, message: '请输入料号' }
] ]
}), }),
dialogVisible: false,
} }
}, },
mounted() { mounted() {
@ -205,6 +204,10 @@ export default {
this.workFormEntity.finishedCounts = response.returnData.finishedCounts this.workFormEntity.finishedCounts = response.returnData.finishedCounts
this.workFormEntity.totalCounts = response.returnData.totalCounts this.workFormEntity.totalCounts = response.returnData.totalCounts
this.workFormEntity.tip = response.returnData.tip this.workFormEntity.tip = response.returnData.tip
if (this.workFormEntity.remainNumOrigin == 0) {
this.workFormEntity.tip = "理论剩余库存为0请确认。"
this.dialogVisible = true
}
} else { } else {
this.resetForms() this.resetForms()
ElMessage.error(response.message) ElMessage.error(response.message)
@ -229,11 +232,12 @@ export default {
if (response.code == 0) { if (response.code == 0) {
if (response.returnData != null && response.returnData.tip != '') { if (response.returnData != null && response.returnData.tip != '') {
this.workFormEntity.tip = response.returnData.tip this.workFormEntity.tip = response.returnData.tip
ElMessage({ this.dialogVisible = true
message: response.returnData.tip, // ElMessage({
type: 'warning', // message: response.returnData.tip,
showClose: true // type: 'warning',
}) // showClose: true
// })
} else { } else {
ElMessage({ ElMessage({
message: response.message, message: response.message,
@ -282,7 +286,7 @@ export default {
confirmFinishWork(confirmParams).then(res => { confirmFinishWork(confirmParams).then(res => {
const response = res.data const response = res.data
if (response.code == 0) { if (response.code == 0) {
if (response.returnData != null) { if (response.returnData != null && response.returnData.tip != '') {
this.workFormEntity.tip = response.returnData.tip this.workFormEntity.tip = response.returnData.tip
} }
this.resetForms() this.resetForms()

View File

@ -167,10 +167,6 @@
<legend>导入物料</legend> <legend>导入物料</legend>
<UploadExcelGoods></UploadExcelGoods> <UploadExcelGoods></UploadExcelGoods>
</fieldset> </fieldset>
<fieldset class="title-area">
<legend>导入工站配置</legend>
<UploadExcelStationConfig></UploadExcelStationConfig>
</fieldset>
</el-dialog> </el-dialog>
</el-config-provider> </el-config-provider>
</div> </div>

View File

@ -35,7 +35,7 @@
clearable></el-input> clearable></el-input>
</div> </div>
</div> </div>
<!-- <div style="display: flex; flex-direction: column;"> <div style="display: flex; flex-direction: column;">
<div class="display-title-div"> <div class="display-title-div">
<span class="display-title-text">工单顺序</span> <span class="display-title-text">工单顺序</span>
</div> </div>
@ -45,7 +45,7 @@
controls-position="right" :min="1" :max="10" /> controls-position="right" :min="1" :max="10" />
</div> </div>
</div> </div>
</div> --> </div>
</div> </div>
</div> </div>
<div style="margin: 10px;"> <div style="margin: 10px;">
@ -81,7 +81,7 @@ export default {
workFormRef: ref(), workFormRef: ref(),
workFormEntity: reactive({ workFormEntity: reactive({
bigBoxNo: '', bigBoxNo: '',
// orderOfOrders: 1 orderOfOrders: null
}), }),
rules: reactive({}), rules: reactive({}),
} }
@ -99,7 +99,7 @@ export default {
this.$refs.bigBoxNo.focus() this.$refs.bigBoxNo.focus()
this.workFormEntity = reactive({ this.workFormEntity = reactive({
bigBoxNo: '', bigBoxNo: '',
// orderOfOrders: 1 orderOfOrders: null
}) })
}, },
confirmTask() { confirmTask() {
@ -110,10 +110,17 @@ export default {
}) })
return return
} }
if (this.workFormEntity.orderOfOrders == null) {
ElMessage({
message: '请输入工单顺序',
type: 'error',
})
return
}
const request = { const request = {
standId: this.standId, standId: this.standId,
bigBoxNo: this.workFormEntity.bigBoxNo, bigBoxNo: this.workFormEntity.bigBoxNo,
// orderOfOrders: this.workFormEntity.orderOfOrders, orderOfOrders: this.workFormEntity.orderOfOrders,
userName: store.getters.getUserName userName: store.getters.getUserName
} }
requestSortBox(request).then(res => { requestSortBox(request).then(res => {

View File

@ -22,9 +22,11 @@
<el-table-column prop="remainNum" label="剩余数量" min-width="120px" /> <el-table-column prop="remainNum" label="剩余数量" min-width="120px" />
<el-table-column prop="totalNum" label="入库数量" min-width="120px" /> <el-table-column prop="totalNum" label="入库数量" min-width="120px" />
<el-table-column prop="vehicleId" label="载具号" min-width="120px" show-overflow-tooltip /> <el-table-column prop="vehicleId" label="载具号" min-width="120px" show-overflow-tooltip />
<el-table-column prop="locationId" label="库位" :formatter="locationFormat" min-width="120px" show-overflow-tooltip /> <el-table-column prop="locationId" label="库位" :formatter="locationFormat" min-width="120px"
show-overflow-tooltip />
<el-table-column prop="isInventory" label="是否盘点" min-width="120px" /> <el-table-column prop="isInventory" label="是否盘点" min-width="120px" />
<el-table-column prop="createTime" label="上架时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip /> <el-table-column prop="createTime" label="上架时间" :formatter="timeFormat" min-width="120px"
show-overflow-tooltip />
<el-table-column prop="goodsStatus" label="物料状态" :formatter="goodsStatusFormat" min-width="120px" /> <el-table-column prop="goodsStatus" label="物料状态" :formatter="goodsStatusFormat" min-width="120px" />
<el-table-column prop="stockStatus" label="库存状态" :formatter="stockStatusFormat" fixed="right" <el-table-column prop="stockStatus" label="库存状态" :formatter="stockStatusFormat" fixed="right"
min-width="120px" /> min-width="120px" />
@ -233,6 +235,10 @@ export default {
return '盘点中' return '盘点中'
case 3: case 3:
return '移库中' return '移库中'
case 4:
return '拣选中'
case 5:
return '回库中'
case 9: case 9:
return '库存锁定' return '库存锁定'
default: default: