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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-13 13:57:33 +08:00
parent d772e7e882 e466221b3f
commit da2462c188
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java
View File

@@ -29,11 +29,13 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
if (StrUtil.isEmpty(point_code)){
throw new BadRequestException("点位不能为空！");
}
String empty_vehicle_code = "";
JSONObject point_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '"+point_code+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(point_jo)){
throw new BadRequestException("未查询到对应点位，请扫描正确的空轴点位！");
if (ObjectUtil.isNotEmpty(point_jo)){
empty_vehicle_code = point_jo.getString("empty_vehicle_code");
}
String empty_vehicle_code = point_jo.getString("empty_vehicle_code");
JSONObject vehicle_jo = new JSONObject();
vehicle_jo.put("vehicle_code",empty_vehicle_code);
JSONObject jo = new JSONObject();

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

@@ -241,7 +241,7 @@
<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 />
<el-table-column prop="instorage_time" label="入库时间" min-width="140" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}

10
lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
View File

@@ -158,8 +158,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="point_code" label="点位编码" />
<el-table-column prop="full_point_code" label="满轴位" />
<el-table-column prop="point_code" label="点位编码" width="100px" show-overflow-tooltip />
<el-table-column prop="full_point_code" label="满轴位" width="110px" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
@@ -170,15 +170,15 @@
{{ 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="container_name" label="母卷号" width="150px" show-overflow-tooltip />
<el-table-column prop="full_vehicle_code" label="母卷轴编号" min-width="100" show-overflow-tooltip />
<el-table-column prop="empty_point_code" label="空轴位" />
<el-table-column prop="empty_point_code" label="空轴位" width="120px" show-overflow-tooltip />
<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] }}
</template>
</el-table-column>
<el-table-column prop="empty_vehicle_code" label="空轴编码" />
<el-table-column prop="empty_vehicle_code" label="空轴编码" width="120px" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置">
<template slot-scope="scope">

6
lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
View File

@@ -145,9 +145,9 @@
<!--表格渲染-->
<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="vehicle_code" label="载具码" />
<el-table-column prop="qzzno" label="气涨轴" />
<el-table-column prop="point_code" label="点位编码" width="100px" />
<el-table-column prop="vehicle_code" label="载具码" width="140px" />
<el-table-column prop="qzzno" label="气涨轴" width="140px" show-overflow-tooltip />
<el-table-column prop="point_status" label="点位状态">
<template slot-scope="scope">
{{ dict.label.delivery_point_status[scope.row.point_status] }}

2
lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
View File

@@ -166,7 +166,7 @@
</el-table-column>
<el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
<el-table-column prop="full_vehicle_code" label="母卷轴编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入箱时间" width="150px" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域">

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

@@ -343,7 +343,7 @@
<el-table-column prop="split_weight" label="子卷理论重量" width="100px" :formatter="crud.formatNum3" />
<el-table-column prop="paper_tube_or_frp" label="管件类型" :formatter="formatTubeName" />
<el-table-column prop="paper_tube_material" label="纸筒物料编码" min-width="140" show-overflow-tooltip />
<el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" />
<el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" show-overflow-tooltip />
<el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip />
<el-table-column prop="frp_material" label="FRP管物料编码" min-width="140" show-overflow-tooltip />
<el-table-column prop="frp_description" label="FRP管物料描述" min-width="140" show-overflow-tooltip />

2
lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue
View File

@@ -100,7 +100,7 @@
<el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
<el-table-column prop="material_model" label="规格/型号" min-width="150" show-overflow-tooltip/>
<el-table-column prop="unit_name" label="主单位"/>
<el-table-column prop="pcsn" label="批次号" min-width="120" show-overflow-tooltip/>
<el-table-column prop="pcsn" label="批次号" min-width="140" show-overflow-tooltip/>
<el-table-column prop="sap_pcsn" label="sap批次" min-width="120" show-overflow-tooltip/>
<el-table-column prop="package_box_sn" label="木箱号" width="250px" min-width="120" show-overflow-tooltip/>