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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-10 16:35:07 +08:00
parent 57e6bebda1 81606c082c
commit dc5031c9fa
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml
View File

@@ -15,6 +15,9 @@
<if test="material_id != null and material_id != ''">
and ma.material_id = #{material_id}
</if>
<if test="sale_code != null and sale_code != ''">
and re.sale_code like '${sale_code}%'
</if>
<if test="storagevehicle_type != null and storagevehicle_type != ''">
and re.storagevehicle_type = #{storagevehicle_type}
</if>
@@ -22,12 +25,14 @@
and re.status = #{status}
</if>
<if test="storagevehicle_code != null and storagevehicle_code != ''">
and re.storagevehicle_code = #{storagevehicle_code}
and re.storagevehicle_code like '${storagevehicle_code}%'
</if>
<if test="bucketunique != null and bucketunique != ''">
and ( re.bucketunique like '${bucketunique}%' )
</if>
order by re.create_time DESC
</select>
<select id="getMstList" resultType="java.util.Map">
select GROUP_CONCAT(bucket_record_id) as bucket_record_id,(@rowcount :=@rowcount+1) as sqe_on, create_time,storagevehicle_code,sale_code,SUM(storage_qty) as storage_qty,count(storagevehicle_code) as count

23
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java
View File

@@ -241,13 +241,30 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl<MdPbBucketrecordMap
}
List<MdPbBucketrecord> has = this.list(new QueryWrapper<MdPbBucketrecord>()
.in("sale_code", data.stream().map(MdPbBucketrecord::getSale_code).collect(Collectors.toSet())));
.in("sale_code", data.stream().map(MdPbBucketrecord::getSale_code).collect(Collectors.toSet()))
.in("storagevehicle_code", data.stream().map(MdPbBucketrecord::getStoragevehicle_code).collect(Collectors.toSet()))
);
if (!CollectionUtils.isEmpty(has)){
Set<String> stos = data.stream().map(MdPbBucketrecord::getStoragevehicle_code).collect(Collectors.toSet());
/* Set<String> stos = data.stream().map(MdPbBucketrecord::getStoragevehicle_code).collect(Collectors.toSet());
String collect = has.stream().filter(a -> stos.contains(a.getStoragevehicle_code())).map(MdPbBucketrecord::getStoragevehicle_code).collect(Collectors.joining(","));
if (StringUtils.isNotEmpty(collect)){
throw new BadRequestException("托盘订单已存在:"+collect);
}
}*/
// 过滤掉相同订单、托盘的组盘记录
String joinSale = has.stream()
.map(MdPbBucketrecord::getSale_code)
.collect(Collectors.joining(","));
String joinVehicle = has.stream()
.map(MdPbBucketrecord::getStoragevehicle_code)
.collect(Collectors.joining(","));
data = data.stream()
.filter(row -> !joinSale.contains(row.getSale_code()) || !joinVehicle.contains(row.getStoragevehicle_code()))
.collect(Collectors.toList());
}
this.saveBatch(data);

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java
View File

@@ -22,9 +22,11 @@ public class StructarrQuery extends BaseQuery<StIvtStructattr> {
private String is_virtualstore;
private String sect_id;
private String struct_code;
private String lock_type;
private String blurry;
@Override
public void paramMapping() {
super.doP.put("search", QParam.builder().k(new String[]{"struct_code","struct_name"}).type(QueryTEnum.LK).build());
super.doP.put("blurry", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build());
}
}

2
mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue
View File

@@ -38,7 +38,7 @@
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
v-model="query.blurry"
clearable
size="mini"
placeholder="仓位编码、名称"