root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

木箱装箱功能开发测试，出库wql修改

Browse Source
This commit is contained in:
ls
2025-07-29 15:49:06 +08:00
parent dd13549d38
commit 4e74fba86b
32 changed files with 1242 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
View File

@@ -265,7 +265,7 @@
<el-table-column prop="productin_qty" label="重量(Kg)" :min-width="flexWidth('productin_qty',crud.data,'重量(Kg)')" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
<el-table-column prop="pscn" label="SAP批次号" :min-width="flexWidth('pscn',crud.data,'批次号')" />
<el-table-column prop="origin" label="母卷来源" :min-width="flexWidth('origin',crud.data,'母卷来源')" :formatter="formatOrigin"/>
<el-table-column prop="origin" label="母卷来源" :min-width="flexWidth('origin',crud.data,'母卷来源')" :formatter="formatOrigin" />
<el-table-column prop="roll_status" label="母卷状态" :min-width="flexWidth('roll_status',crud.data,'母卷状态')" :formatter="formatRollStatus" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot" />

8
lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
View File

@@ -357,10 +357,10 @@
<el-table-column prop="status" label="状态" :formatter="formatStatusName" />
<el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName" />
<el-table-column prop="mfg_order_name" label="订单号" min-width="200" />
<!-- <template slot-scope="scope">-->
<!-- <el-link type="primary" @click="toView2(scope.$index, scope.row)">{{ scope.row.mfg_order_name }}</el-link>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <template slot-scope="scope">-->
<!-- <el-link type="primary" @click="toView2(scope.$index, scope.row)">{{ scope.row.mfg_order_name }}</el-link>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="container_name" label="子卷号" min-width="140" show-overflow-tooltip />
<el-table-column prop="parent_container_name" label="母卷号" min-width="120" show-overflow-tooltip />
<el-table-column prop="ware_house" label="来源位置" :formatter="formatHouseName" width="120px" />

18
lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
View File

@@ -93,59 +93,59 @@
<!--左侧插槽-->
<slot name="left" />
<el-button
v-if="crud.status.cu > 0"
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
v-if="crud.status.cu > 0"
@click="queryDtl()"
>
添加盘点物料
</el-button>
<el-button
v-if="crud.status.view > 0"
slot="left"
class="filter-item"
type="success"
icon="el-icon-refresh"
size="mini"
:loading="showDtlLoading"
v-if="crud.status.view > 0"
@click="queryDtlCheck('1')"
>
已盘点
</el-button>
<el-button
v-if="crud.status.view > 0"
slot="left"
class="filter-item"
type="success"
icon="el-icon-refresh"
size="mini"
:loading="showDtlLoading"
v-if="crud.status.view > 0"
@click="queryDtlCheck('2')"
>
未盘点
</el-button>
<el-button
v-if="crud.status.view > 0"
slot="left"
class="filter-item"
type="success"
icon="el-icon-thumb"
size="mini"
:loading="showDtlLoading"
v-if="crud.status.view > 0"
@click="downdtl"
>
导出
</el-button>
<el-button
v-if="crud.status.view > 0"
slot="left"
class="filter-item"
type="success"
icon="el-icon-folder-add"
size="mini"
v-if="crud.status.view > 0"
@click="repairDialog"
>
补录信息
@@ -170,11 +170,11 @@
<span v-if="crud.status.cu > 0">{{ scope.row.storagevehicle_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip v-if="crud.status.view > 0" prop="base_qty" label="净重" width="150" align="center" :formatter="crud.formatNum3"/>
<el-table-column v-if="crud.status.view > 0" show-overflow-tooltip prop="base_qty" label="净重" width="150" align="center" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150" show-overflow-tooltip />
<el-table-column prop="date_of_production" label="生产日期" v-if="crud.status.view > 0" align="center" min-width="150" show-overflow-tooltip />
<el-table-column prop="remark" v-if="crud.status.view > 0" label="备注" align="center" min-width="150" show-overflow-tooltip />
<el-table-column v-if="crud.status.view > 0" prop="date_of_production" label="生产日期" align="center" min-width="150" show-overflow-tooltip />
<el-table-column v-if="crud.status.view > 0" prop="remark" label="备注" align="center" min-width="150" show-overflow-tooltip />
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
@@ -182,7 +182,7 @@
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
<DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView"/>
<DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView" />
<RepairDialog :dialog-show.sync="repairShow" :open-param="check_code" :father-method="queryDtlView" />
</el-dialog>
</template>

2
lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue
View File

@@ -123,7 +123,7 @@
<el-button type="primary" @click="submitCheck">确认</el-button>
</span>
<MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
<DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView"/>
<DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView" />
</el-dialog>
</template>

14
lms/nladmin-ui/src/views/wms/st/inStor/check/RepairDialog.vue
View File

@@ -19,7 +19,7 @@
<el-input v-model="form1.material_code" style="width: 250px;" />
</el-form-item>
<el-form-item label="备注:" prop="remark">
<el-input type="textarea" v-model="form1.remark" style="width: 250px;" />
<el-input v-model="form1.remark" type="textarea" style="width: 250px;" />
</el-form-item>
</el-form>
@@ -52,6 +52,12 @@ export default {
default: null
}
},
data() {
return {
dialogVisible: false,
form1: {}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
@@ -59,12 +65,6 @@ export default {
}
}
},
data() {
return {
dialogVisible: false,
form1: {}
}
},
methods: {
handleClose(done) {
this.$confirm('确认关闭？')