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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-12-10 14:54:41 +08:00
parent 9f8fb05cd0
commit c17ac89550
9 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_RAWFOILWORKORDER_01.wql
View File

@@ -47,9 +47,11 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
der.*
der.*,
ivt.point_code AS point_code2
FROM
pdm_bi_rawfoilworkorder der
LEFT JOIN ST_IVT_SbPointIvt ivt ON ivt.ext_code = der.resource_name
WHERE
der.is_delete = '0'

4
lms/nladmin-ui/src/views/wms/basedata/master/transport/index.vue
View File

@@ -172,8 +172,8 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="cust_code" width="120px" label="物流公司编码" :min-width="flexWidth('cust_code',crud.data,'物流公司编码')" />
<el-table-column prop="cust_name" width="120px" label="物流公司名称 " :min-width="flexWidth('cust_name',crud.data,'物流公司名称 ')" />
<el-table-column prop="cust_code" label="物流公司编码" :min-width="flexWidth('cust_code',crud.data,'物流公司编码')" />
<el-table-column prop="cust_name" label="物流公司名称 " :min-width="flexWidth('cust_name',crud.data,'物流公司名称 ')" />
<el-table-column prop="cust_simple_name" width="120px" label="物流公司简称" :min-width="flexWidth('cust_simple_name',crud.data,'物流公司简称')" />
<el-table-column prop="is_used" label="启用 ">
<template slot-scope="scope">

4
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -103,11 +103,11 @@
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<!-- <el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />-->
<el-table-column prop="quality_scode" label="品质类型" min-width="120" show-overflow-tooltip>
<!-- <el-table-column prop="quality_scode" label="品质类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.ST_QUALITY_SCODE[scope.row.quality_scode] }}
</template>
</el-table-column>
</el-table-column>-->
<el-table-column prop="package_box_sn" label="木箱码" :min-width="flexWidth('package_box_sn',crud.data,'木箱码')" />
<el-table-column prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />
<el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />

2
lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
View File

@@ -155,7 +155,7 @@
<el-table-column prop="stor_name" label="仓库名称" width="150" />
<el-table-column prop="simple_name" label="简称" width="130" />
<el-table-column prop="stor_capacity" label="容量" />
<el-table-column prop="total_area" label="总面积(㎡)" />
<el-table-column prop="total_area" width="100px" label="总面积(㎡)" />
<el-table-column prop="label" label="仓库性质" />
<el-table-column prop="storea_ddress" label="地址" />
<el-table-column prop="principal" label="负责人" />

6
lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
View File

@@ -201,9 +201,9 @@
<!--
<el-table-column type="selection" width="55" />
-->
<el-table-column prop="struct_code" label="仓位编码" width="120" show-overflow-tooltip />
<el-table-column prop="struct_name" label="仓位名称" width="150" show-overflow-tooltip />
<el-table-column prop="simple_name" label="仓位简称" width="100" />
<el-table-column prop="struct_code" label="仓位编码" :min-width="flexWidth('struct_code',crud.data,'仓位编码')" />
<el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
<el-table-column prop="simple_name" label="仓位简称" :min-width="flexWidth('simple_name',crud.data,'仓位简称')" />
<el-table-column prop="sect_name" label="所属库区" width="150" />
<el-table-column prop="stor_name" label="所属仓库" width="150" />
<el-table-column prop="storagevehicle_code" label="载具号" min-width="120" show-overflow-tooltip />

12
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue
View File

@@ -212,21 +212,21 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="cool_ivt_status" label="库存状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_cool_ivt_status[scope.row.cool_ivt_status] }}
</template>
</el-table-column>
<el-table-column prop="full_point_code" label="满轴位" />
<el-table-column prop="full_point_code" label="满轴位" :min-width="flexWidth('full_point_code',crud.data,'满轴位')" />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_full_point_status[scope.row.full_point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="full_vehicle_code" label="母卷轴编号" min-width="120" show-overflow-tooltip />
<el-table-column prop="empty_point_code" label="空轴位" />
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="full_vehicle_code" label="母卷轴编号" :min-width="flexWidth('full_vehicle_code',crud.data,'母卷轴编号')" />
<el-table-column prop="empty_point_code" label="空轴位" :min-width="flexWidth('empty_point_code',crud.data,'空轴位')" />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
@@ -238,7 +238,7 @@
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="qty_unit_name" label="计量单位" />
<el-table-column prop="instorage_time" label="入库时间" min-width="120" show-overflow-tooltip />

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

@@ -40,6 +40,7 @@
</el-form-item>
<el-form-item label="母卷号">
<label slot="label">母&nbsp;&nbsp;卷&nbsp;&nbsp;号:</label>
<el-input
v-model="query.container_name"
clearable
@@ -208,18 +209,19 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="工单标识" />
<el-table-column prop="mfg_order_name" label="工单号" min-width="120" show-overflow-tooltip />
<el-table-column prop="status" label="工单状态" :formatter="formatStatusName" />
<el-table-column prop="container_name" label="母卷号" min-width="120" show-overflow-tooltip />
<el-table-column prop="resource_name" label="机台编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="product_name" label="产品编码" min-width="150" show-overflow-tooltip />
<el-table-column prop="theory_height" label="理论长度" />
<el-table-column prop="realstart_time" label="开始时间" width="150px" />
<el-table-column prop="realend_time" label="结束时间" width="150px" />
<el-table-column prop="productin_qty" label="重量" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="update_time" label="更新时间" width="150px" />
<el-table-column prop="mfg_order_name" label="工单号" :min-width="flexWidth('mfg_order_name',crud.data,'工单号')" />
<el-table-column prop="status" label="工单状态" :min-width="flexWidth('status',crud.data,'工单状态')" :formatter="formatStatusName"/>
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="point_code2" label="点位编码" :min-width="flexWidth('point_code2',crud.data,'点位编码')" />
<el-table-column prop="resource_name" label="机台编码" :min-width="flexWidth('resource_name',crud.data,'机台编码')" />
<el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品编码')" />
<el-table-column prop="theory_height" label="理论长度" :min-width="flexWidth('theory_height',crud.data,'理论长度')" />
<el-table-column prop="realstart_time" label="开始时间" :min-width="flexWidth('realstart_time',crud.data,'开始时间')" />
<el-table-column prop="realend_time" label="结束时间" :min-width="flexWidth('realend_time',crud.data,'结束时间')" />
<el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

1
lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -177,6 +177,7 @@
<span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" align="center" />
<el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
<template scope="scope">
<el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />

6
lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
View File

@@ -82,12 +82,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="出入库单号">
<el-form-item label="出入单号">
<el-input
v-model="query.bill_code"
size="mini"
clearable
placeholder="出入库单号"
placeholder="出入单号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -109,6 +109,7 @@
</el-select>
</el-form-item>
<el-form-item label="物料">
<label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料:</label>
<el-input
v-model="query.material_code"
size="mini"
@@ -118,6 +119,7 @@
/>
</el-form-item>
<el-form-item label="批次">
<label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>
<el-input
v-model="query.pcsn"
size="mini"