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

Merge branch 'master' into master_merge

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
This commit is contained in:
liuxy
2024-06-20 17:16:42 +08:00
parent a6be1338da ee7a406d81
commit 1ae9b12cdc
83 changed files with 3572 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,7 +239,8 @@
<el-table-column prop="ivt_qty" label="库存数" :formatter="rounding"/>
<el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding"/>
<el-table-column prop="unit_name" label="计量单位"/>
<el-table-column prop="instorage_time" label="入库时间" min-width="150"/>
<el-table-column prop="confirm_time" label="入库时间" min-width="150"/>
<el-table-column prop="joint_type" label="接头数" min-width="150"/>
<el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType"/>
<el-table-column prop="stock_age" label="生产时长（天）" min-width="120" />
<el-table-column prop="paper_type" label="管件类型" min-width="150"/>