rev：子卷装箱
This commit is contained in:
@@ -38,7 +38,7 @@ public interface IpdmBiSubpackagerelationService extends IService<PdmBiSubpackag
|
||||
* @param page 分页参数
|
||||
* @return Map<String, Object>
|
||||
*/
|
||||
Map<String, Object> queryBoxSpec(Map whereJson, Pageable page);
|
||||
Object queryBoxSpec(Map whereJson, Pageable page);
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import lombok.SneakyThrows;
|
||||
import lombok.extern.log4j.Log4j;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
@@ -31,10 +32,10 @@ import org.nl.b_lms.sch.tasks.first_floor_area.DjqTask;
|
||||
import org.nl.b_lms.sch.tasks.first_floor_area.ZxDjwTask;
|
||||
import org.nl.b_lms.sch.tasks.first_floor_area.ZxqTask;
|
||||
import org.nl.b_lms.sch.tasks.first_floor_area.auto.TaskQueue;
|
||||
import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
|
||||
import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper;
|
||||
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
|
||||
import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxManageService;
|
||||
import org.nl.common.TableDataInfo;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.common.enums.PackageInfoIvtEnum;
|
||||
import org.nl.common.utils.SecurityUtils;
|
||||
@@ -128,43 +129,17 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
|
||||
/**
|
||||
* 查询待检区木箱规格
|
||||
*
|
||||
* @param whereJson 查询条件
|
||||
* @param page 分页参数
|
||||
* @param query 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
*/
|
||||
@Override
|
||||
public Map<String, Object> queryBoxSpec(Map whereJson, Pageable page) {
|
||||
Map<String, Object> boxInfoList = new HashMap<String, Object>();
|
||||
IPage<BstIvtBoxinfo> resultPage = new Page<>(page.getPageNumber() + 1, page.getPageSize());
|
||||
LambdaQueryWrapper<BstIvtBoxinfo> queryWrapper = new LambdaQueryWrapper<>();
|
||||
if (whereJson.containsKey("search")) {
|
||||
String searchValue = whereJson.get("search").toString();
|
||||
queryWrapper.and(w ->
|
||||
w.eq(BstIvtBoxinfo::getBox_length, searchValue)
|
||||
.or()
|
||||
.eq(BstIvtBoxinfo::getMaterial_code, searchValue)
|
||||
.or()
|
||||
.like(BstIvtBoxinfo::getMaterial_name, searchValue)
|
||||
.or()
|
||||
.like(BstIvtBoxinfo::getBox_no, searchValue)
|
||||
.or()
|
||||
.eq(BstIvtBoxinfo::getBox_id, searchValue)
|
||||
.or()
|
||||
.eq(BstIvtBoxinfo::getBox_high, searchValue)
|
||||
.or()
|
||||
.eq(BstIvtBoxinfo::getBox_width, searchValue)
|
||||
.or()
|
||||
.eq(BstIvtBoxinfo::getNum, searchValue)
|
||||
.or()
|
||||
.eq(BstIvtBoxinfo::getVehicle_type, searchValue)
|
||||
);
|
||||
}
|
||||
queryWrapper.eq(BstIvtBoxinfo::getIs_packing, "0");
|
||||
queryWrapper.groupBy(BstIvtBoxinfo::getMaterial_code);
|
||||
queryWrapper.orderByAsc(BstIvtBoxinfo::getBox_id);
|
||||
IPage<BstIvtBoxinfo> result = bstIvtBoxinfoMapper.selectPage(resultPage, queryWrapper);
|
||||
boxInfoList.put("content", result.getRecords());
|
||||
boxInfoList.put("totalElements", result.getTotal());
|
||||
return boxInfoList;
|
||||
public Object queryBoxSpec(Map query, Pageable pageQuery) {
|
||||
com.github.pagehelper.Page<Object> page = PageHelper.startPage(pageQuery.getPageNumber() + 1, pageQuery.getPageSize());
|
||||
List<Map> mst_detail = bstIvtBoxinfoMapper.getPageQuery(query, pageQuery);
|
||||
TableDataInfo<Map> build = TableDataInfo.build(mst_detail);
|
||||
build.setTotalElements(page.getTotal());
|
||||
return build;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -230,6 +205,10 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
|
||||
r.setQuanlity_in_box(BigDecimal.ZERO);
|
||||
r.setBox_group("0");
|
||||
}
|
||||
|
||||
// TODO 调用方法获取木箱料号：输入：子卷号、输出：木箱信息
|
||||
// r.setBox_type("441510009000470");
|
||||
|
||||
});
|
||||
return pdmBiSubpackagerelationList;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
package org.nl.b_lms.storage_manage.database.service.dao.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -13,4 +19,11 @@ import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
|
||||
*/
|
||||
public interface BstIvtBoxinfoMapper extends BaseMapper<BstIvtBoxinfo> {
|
||||
|
||||
/**
|
||||
* 查询入库单
|
||||
* @param query: 查询条件
|
||||
* @param pageQuery: 分页工具
|
||||
* @return List<Map>
|
||||
*/
|
||||
List<Map> getPageQuery(@Param("query") Map query, @Param("pageQuery") Pageable pageQuery);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,32 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper">
|
||||
<select id="getPageQuery" resultType="java.util.Map">
|
||||
SELECT
|
||||
count(box.material_code) AS ivt_num,
|
||||
MAX(box.material_code) AS material_code,
|
||||
MAX(box.material_name) AS material_name,
|
||||
MAX(box.box_length) AS box_length,
|
||||
MAX(box.box_width) AS box_width,
|
||||
MAX(box.box_high) AS box_high,
|
||||
MAX(box.num) AS num
|
||||
FROM
|
||||
bst_ivt_boxinfo box
|
||||
INNER JOIN st_ivt_structattr attr ON attr.storagevehicle_code = box.box_no
|
||||
<where>
|
||||
box.is_packing = '0'
|
||||
AND attr.lock_type = '1'
|
||||
AND attr.is_delete = '0'
|
||||
and attr.is_used = '1'
|
||||
|
||||
<if test="query.search != null and query.search != ''">
|
||||
and (box.material_code = #{query.search}
|
||||
or box.material_name LIKE '%${query.search}%')
|
||||
</if>
|
||||
|
||||
GROUP BY box.material_code
|
||||
|
||||
</where>
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
:row-key="row => row.name"
|
||||
:span-method="handleSpanMethod"
|
||||
@row-click="handleRowClick"
|
||||
@row-click="handleRowClick"handleRowClick
|
||||
>
|
||||
<!-- 列的定义... -->
|
||||
<!-- <el-table-column prop="box_group" label="木箱组 " align="center" width="120">-->
|
||||
@@ -117,12 +117,14 @@
|
||||
<el-table-column show-overflow-tooltip prop="box_group" label="木箱组" align="center" width="130" />
|
||||
<el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="paper_tube_description" label="子卷规格" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
|
||||
</el-table>
|
||||
</el-card>
|
||||
<MaterDiv
|
||||
ref="child"
|
||||
:dialog-show.sync="structShow"
|
||||
:paper-tube-description="paperTubeDescription"
|
||||
:box-type="box_type"
|
||||
:sect-prop="sectProp"
|
||||
@tableChanged="tableChanged"
|
||||
/>
|
||||
@@ -172,6 +174,7 @@ export default {
|
||||
isButtonDisabled: false, // 木箱规格分配按钮
|
||||
isButtonDisabled1: true, // 手动同步MES按钮
|
||||
searchText: '',
|
||||
box_type: '',
|
||||
// 存储搜索前的选中状态
|
||||
previousSelection: [],
|
||||
// 存储搜索后的选中状态
|
||||
@@ -316,6 +319,8 @@ export default {
|
||||
const selectedRows = table2Data.filter(row => (row.container_name == groupValue) || (row.box_group === groupValue && row.box_group !== null && row.box_group !== '0'))
|
||||
table2.clearSelection()
|
||||
selectedRows.forEach(row => table2.toggleRowSelection(row))
|
||||
// 给木箱料号赋值
|
||||
this.box_type = scope.box_type
|
||||
},
|
||||
// 表格2的行点击事件
|
||||
handleSelectionChange(selection) {
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
<el-table-column prop="box_length" label="木箱长度" />
|
||||
<el-table-column prop="box_width" label="木箱宽度" />
|
||||
<el-table-column prop="box_high" label="木箱高度" />
|
||||
<el-table-column prop="ivt_num" label="木箱库存数" />
|
||||
<el-table-column prop="num" label="最大装卷数" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
@@ -117,6 +118,10 @@ export default {
|
||||
paperTubeDescription: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
boxType: {
|
||||
type: String,
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@@ -176,6 +181,7 @@ export default {
|
||||
this.query.is_lock = '1'
|
||||
this.query.lock = this.lock
|
||||
this.query.is_used = '1'
|
||||
this.query.search = this.boxType
|
||||
this.crud.toQuery()
|
||||
},
|
||||
handleSelectionChange(val, row) {
|
||||
|
||||
Reference in New Issue
Block a user