feat: 更新应用版本至1.3.17并添加钢卷导出功能
- 在config.js、manifest.json和version.json中更新版本号至1.3.17 - 新增钢卷导出API接口 - 在接收和编辑页面添加长度输入字段 - 修改钢卷发货逻辑,增加质量状态校验并使用新的导出接口
This commit is contained in:
@@ -68,3 +68,10 @@ export function getMaterialCoilTrace(enterCoilNo, currentCoilNo) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function exportCoil(coilId) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/materialCoil/exportCoil/' + coilId,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ module.exports = {
|
|||||||
// 应用名称
|
// 应用名称
|
||||||
name: "ruoyi-app",
|
name: "ruoyi-app",
|
||||||
// 应用版本
|
// 应用版本
|
||||||
version: "1.3.16",
|
version: "1.3.17",
|
||||||
// 应用logo
|
// 应用logo
|
||||||
logo: "/static/logo.jpg",
|
logo: "/static/logo.jpg",
|
||||||
// 官方网站
|
// 官方网站
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name" : "科伦普",
|
"name" : "科伦普",
|
||||||
"appid" : "__UNI__E781B49",
|
"appid" : "__UNI__E781B49",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.3.16",
|
"versionName" : "1.3.17",
|
||||||
"versionCode" : 1,
|
"versionCode" : 1,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
|||||||
@@ -122,7 +122,8 @@
|
|||||||
getMaterialCoil,
|
getMaterialCoil,
|
||||||
updateMaterialCoilSimple,
|
updateMaterialCoilSimple,
|
||||||
listMaterialCoil,
|
listMaterialCoil,
|
||||||
updateMaterialCoil
|
updateMaterialCoil,
|
||||||
|
exportCoil
|
||||||
} from '@/api/wms/coil.js'
|
} from '@/api/wms/coil.js'
|
||||||
import {
|
import {
|
||||||
addPendingAction
|
addPendingAction
|
||||||
@@ -400,11 +401,13 @@
|
|||||||
showCancel: true,
|
showCancel: true,
|
||||||
success: async () => {
|
success: async () => {
|
||||||
try {
|
try {
|
||||||
|
// 判断钢卷的质量状态,必须是A+, A,A-, B+其中之一
|
||||||
|
if (!['A+', 'A', 'A-', 'B+'].includes(coilRes.data.qualityStatus)) {
|
||||||
|
this.$message.warning('钢卷质量状态需在B+及以上');
|
||||||
|
return;
|
||||||
|
}
|
||||||
// 1. 更新钢卷状态为已发货
|
// 1. 更新钢卷状态为已发货
|
||||||
await updateMaterialCoilSimple({
|
await exportCoil(coilRes.data.coilId);
|
||||||
...coilRes.data,
|
|
||||||
status: 1,
|
|
||||||
});
|
|
||||||
|
|
||||||
// 2. 插入一条已完成的待操作记录
|
// 2. 插入一条已完成的待操作记录
|
||||||
await addPendingAction({
|
await addPendingAction({
|
||||||
|
|||||||
@@ -61,6 +61,13 @@
|
|||||||
<input v-model="form.netWeight" type="digit" placeholder="请输入净重(选填)" class="form-input"
|
<input v-model="form.netWeight" type="digit" placeholder="请输入净重(选填)" class="form-input"
|
||||||
:disabled="coilDetail.dataType === 0" :class="{ 'form-input-disabled': coilDetail.dataType === 0 }" />
|
:disabled="coilDetail.dataType === 0" :class="{ 'form-input-disabled': coilDetail.dataType === 0 }" />
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<!-- 长度 -->
|
||||||
|
<view class="form-item form-item-optional">
|
||||||
|
<text class="form-label-optional">长度 (米)</text>
|
||||||
|
<input v-model="form.length" type="digit" placeholder="请输入长度(选填)" class="form-input"
|
||||||
|
:disabled="coilDetail.dataType === 0" :class="{ 'form-input-disabled': coilDetail.dataType === 0 }" />
|
||||||
|
</view>
|
||||||
|
|
||||||
<!-- 操作者信息 -->
|
<!-- 操作者信息 -->
|
||||||
<view class="operator-info">
|
<view class="operator-info">
|
||||||
|
|||||||
@@ -97,6 +97,13 @@
|
|||||||
<input v-model="form.netWeight" type="digit" placeholder="请输入净重(选填)" class="form-input"
|
<input v-model="form.netWeight" type="digit" placeholder="请输入净重(选填)" class="form-input"
|
||||||
:disabled="form.dataType === 0" :class="{ 'form-input-disabled': form.dataType === 0 }" />
|
:disabled="form.dataType === 0" :class="{ 'form-input-disabled': form.dataType === 0 }" />
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<!-- 长度 -->
|
||||||
|
<view class="form-item form-item-optional">
|
||||||
|
<text class="form-label-optional">长度 (米)</text>
|
||||||
|
<input v-model="form.length" type="digit" placeholder="请输入长度(选填)" class="form-input"
|
||||||
|
:disabled="form.dataType === 0" :class="{ 'form-input-disabled': form.dataType === 0 }" />
|
||||||
|
</view>
|
||||||
|
|
||||||
<!-- 操作者信息 -->
|
<!-- 操作者信息 -->
|
||||||
<view class="operator-info">
|
<view class="operator-info">
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "klp 1.3.16",
|
"version": "klp 1.3.17",
|
||||||
"wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt",
|
"wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt",
|
||||||
"apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk"
|
"apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user