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

add:增加子卷规格校验

Browse Source
This commit is contained in:
gongbaoxiong
2024-07-02 17:13:27 +08:00
parent 3faf1b65c1
commit c3a8cd70bd
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
View File

@@ -84,7 +84,7 @@
WHERE b.point_status = '3' WHERE b.point_status = '3'
AND b.ivt_status = '3' AND b.ivt_status = '3'
AND a.sale_order_name = #{sale_order_name} AND a.sale_order_name = #{sale_order_name}
ORDER BY paper_tube_description ORDER BY box_group
</select> </select>

5
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -295,8 +295,11 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
Set<String> containerNameList = packagerelationList.stream() Set<String> containerNameList = packagerelationList.stream()
.map(PdmBiSubpackagerelation::getContainer_name) .map(PdmBiSubpackagerelation::getContainer_name)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
BigDecimal totalWeight;
List<PdmBiSlittingproductionplan> planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().in(PdmBiSlittingproductionplan::getContainer_name, containerNameList)); List<PdmBiSlittingproductionplan> planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().in(PdmBiSlittingproductionplan::getContainer_name, containerNameList));
if (CollectionUtils.isEmpty(planList)) {
throw new BadRequestException("该箱号不存在分切计划");
}
BigDecimal totalWeight;
totalWeight = planList.stream() totalWeight = planList.stream()
.map(PdmBiSlittingproductionplan::getWeight) .map(PdmBiSlittingproductionplan::getWeight)
.filter(Objects::nonNull) .filter(Objects::nonNull)

3
lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
View File

@@ -380,6 +380,9 @@ export default {
if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) { if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) {
debugger debugger
const descriptionList = this.currentSelection.filter(item => item.paper_tube_description !== null && item.paper_tube_description !== '') const descriptionList = this.currentSelection.filter(item => item.paper_tube_description !== null && item.paper_tube_description !== '')
if (descriptionList.length === 0) {
this.crud.notify('未查询到该子卷的规格信息，请检查子卷的分切计划信息！', CRUD.NOTIFICATION_TYPE.WARNING)
}
const paper_tube_description = descriptionList[0].paper_tube_description const paper_tube_description = descriptionList[0].paper_tube_description
const descriptionsAreSame = this.currentSelection.every(item => item.paper_tube_description === paper_tube_description) const descriptionsAreSame = this.currentSelection.every(item => item.paper_tube_description === paper_tube_description)
if (descriptionsAreSame) { if (descriptionsAreSame) {