liuxy/HuaDongYiYaoWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：库存查询袋信息

Browse Source
This commit is contained in:
liuxy
2025-12-03 15:41:01 +08:00
parent 48d47cbba0
commit ef53f522ed
14 changed files with 274 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicleext.java
View File

@@ -96,5 +96,11 @@ public class MdPbStoragevehicleext implements Serializable {
@TableField(exist = false)
private String struct_code;
/**
* 袋码
*/
@TableField(exist = false)
private String bag_code;
}

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml
View File

@@ -132,7 +132,6 @@
md_pb_storagevehicleext ext
INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code
INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
LEFT JOIN md_pb_groupplate late ON late.material_id = ext.material_id and late.pcsn = ext.pcsn and late.vehicle_code = ext.storagevehicle_code
<where>
1 = 1
<if test="param.stor_id != null and param.stor_id != ''">

66
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/decisioner/impl/base/MiddleRuleHandler.java Normal file
View File

@@ -0,0 +1,66 @@
package org.nl.wms.decision_manage.service.decisioner.impl.base;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleextService;
import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleext;
import org.nl.wms.basedata_manage.service.dao.Structattr;
import org.nl.wms.basedata_manage.service.dto.StrategyMater;
import org.nl.wms.basedata_manage.service.dto.StrategyStructParam;
import org.nl.wms.decision_manage.service.decisioner.Decisioner;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
* 同批物料存放策略 实现类
* </p>
*
* @author Liuxy
* @since 2025-12-03
*/
@Service("middle")
@Slf4j
public class MiddleRuleHandler extends Decisioner<Structattr, StrategyStructParam> {
@Resource
private IMdPbStoragevehicleextService iMdPbStoragevehicleextService;
@Override
public List<Structattr> handler(List<Structattr> list, StrategyStructParam param) {
log.info("---------执行middle入库分配规则---------");
// 根据托盘查询库内库存
List<String> vehicleList = list.stream()
.filter(row -> ObjectUtil.isNotEmpty(row.getStoragevehicle_code()))
.map(Structattr::getStoragevehicle_code)
.distinct()
.collect(Collectors.toList());
List<MdPbStoragevehicleext> extList = iMdPbStoragevehicleextService.list(
new QueryWrapper<MdPbStoragevehicleext>().lambda()
.in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleList)
);
if (ObjectUtil.isEmpty(extList)) {
// 查询一组未有货的仓位
}
// 不为空则判断是否有匹配的物料仓位
StrategyMater strategyMater = param.getStrategyMaters().get(0);
MdPbStoragevehicleext extDaoLike = extList.stream()
.filter(row -> row.getMaterial_id().equals(strategyMater.getMaterial_id())
&& row.getPcsn().equals(strategyMater.getPcsn())
).findFirst().orElse(null);
if (ObjectUtil.isEmpty(extDaoLike)) {
}
return null;
}
}

19
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml
View File

@@ -32,16 +32,17 @@
<select id="queryOutBillDisDtl" resultType="org.nl.wms.warehouse_management.service.dto.IOStorInvDisDto">
SELECT
dis.*,
mb.material_code,
mb.material_name,
task.task_code,
ext.insert_time
dis.*,
mb.material_code,
mb.material_name,
task.task_code,
ext.insert_time
FROM
st_ivt_iostorinvdis dis
LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
LEFT JOIN sch_base_task task ON task.task_id = dis.task_id
LEFT JOIN md_pb_storagevehicleext ext ON ext.storagevehicle_code = dis.storagevehicle_code
st_ivt_iostorinvdis dis
LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
LEFT JOIN sch_base_task task ON task.task_id = dis.task_id
LEFT JOIN md_pb_storagevehicleext ext ON ext.storagevehicle_code = dis.storagevehicle_code
AND dis.pcsn = ext.pcsn AND dis.material_id = ext.material_id
where
1=1
<if test="params.iostorinvdtl_id != null">

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml
View File

@@ -95,7 +95,9 @@
mb.material_name,
mb.material_spec,
mst.bill_code,
late.vehicle_code
late.vehicle_code,
late.vehicle_code AS storagevehicle_code,
late.bag_code
FROM
st_ivt_iostorinvdtl dtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id

5
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dto/IOStorInvDtlDto.java
View File

@@ -34,4 +34,9 @@ public class IOStorInvDtlDto extends IOStorInvDtl {
* 载具编号
*/
private String storagevehicle_code;
/**
* 袋码
*/
private String bag_code;
}

24
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
View File

@@ -1295,20 +1295,29 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
updateIvtList.add(jsonIvt);
iMdPbStoragevehicleextService.updateIvt(updateIvtList);
GroupPlate groupPlate = groupPlateMapper.selectOne(
List<GroupPlate> lateList = groupPlateMapper.selectList(
new QueryWrapper<GroupPlate>().lambda()
.eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
.eq(GroupPlate::getVehicle_code, ioStorInvDis.getStoragevehicle_code())
.eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
.eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
);
double sub_qty = NumberUtil.sub(groupPlate.getQty(), ioStorInvDis.getPlan_qty()).doubleValue();
if (sub_qty != 0) {
groupPlate.setQty(BigDecimal.valueOf(sub_qty));
if (ObjectUtil.isEmpty(lateList)) {
throw new BadRequestException("此载具没有组盘【"+ioStorInvDis.getStoragevehicle_code()+"】");
}
// 如果有袋码则不更新组盘信息，由手持进行更新
boolean is_emp = lateList.stream()
.anyMatch(row -> ObjectUtil.isEmpty(row.getBag_code()));
if (is_emp) {
GroupPlate groupPlate = lateList.get(0);
double sub_qty = NumberUtil.sub(groupPlate.getQty(), ioStorInvDis.getPlan_qty()).doubleValue();
if (sub_qty != 0) {
groupPlate.setQty(BigDecimal.valueOf(sub_qty));
}
groupPlate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("出库"));
groupPlateMapper.updateById(groupPlate);
}
groupPlate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("出库"));
groupPlateMapper.updateById(groupPlate);
// 查询该明细下是否还有未完成的分配明细
int countDis = ioStorInvDisMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDis.class)
@@ -1316,7 +1325,6 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
.ne(IOStorInvDis::getWork_status, IOSEnum.INBILL_DIS_STATUS.code("完成"))
);
// 如果分配明细全部完成则更新明细表状态
if (countDis == 0) {
// 更新明细表状态

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -752,6 +752,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
jsonIvt.put("qty_unit_id", ioStorInvDis.getQty_unit_id());
jsonIvt.put("qty_unit_name", ioStorInvDis.getQty_unit_name());
jsonIvt.put("change_qty", ioStorInvDis.getPlan_qty());
jsonIvt.put("bag_code", ioStorInvDis.getBag_code());
updateIvtList.add(jsonIvt);
iMdPbStoragevehicleextService.updateIvt(updateIvtList);

16
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/util/UpdateIvtUtils.java
View File

@@ -132,7 +132,11 @@ public class UpdateIvtUtils {
// 更新库存
extDao.setCanuse_qty(NumberUtil.add(extDao.getCanuse_qty(), where.getBigDecimal("change_qty")));
iMdPbStoragevehicleextService.updateById(extDao);
// 更新组盘数量
if (ObjectUtil.isNotEmpty(where.getString("bag_code"))) {
extDao.setBag_code(where.getString("bag_code"));
}
updateGroupNum(extDao);
} else {
// 插入数据
@@ -275,8 +279,10 @@ public class UpdateIvtUtils {
iMdPbStoragevehicleextService.updateById(extDao);
// 更新组盘信息
if (ObjectUtil.isNotEmpty(where.getString("bag_code"))) {
extDao.setBag_code(where.getString("bag_code"));
}
updateGroupNum(extDao);
}
/**
@@ -316,8 +322,14 @@ public class UpdateIvtUtils {
.eq(GroupPlate::getVehicle_code, extDao.getStoragevehicle_code())
.eq(GroupPlate::getMaterial_id, extDao.getMaterial_id())
.eq(GroupPlate::getPcsn, extDao.getPcsn())
.eq(ObjectUtil.isNotEmpty(extDao.getBag_code()),GroupPlate::getBag_code,extDao.getBag_code())
);
groupPlate.setQty(extDao.getCanuse_qty());
if (ObjectUtil.isNotEmpty(extDao.getBag_code())) {
groupPlate.setQty(groupPlate.getQty());
} else {
groupPlate.setQty(extDao.getCanuse_qty());
}
groupPlateMapper.updateById(groupPlate);
}

3
wms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
View File

@@ -131,6 +131,7 @@
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具编码" />
<el-table-column show-overflow-tooltip prop="bag_code" label="袋码" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
@@ -313,7 +314,7 @@ export default {
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.pcsn === item.pcsn) {
if (row.pcsn === item.pcsn && row.bag_code === item.bag_code) {
same_mater = false
}
})

1
wms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
View File

@@ -53,6 +53,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip width="150" prop="vehicle_code" label="载具编码" />
<el-table-column show-overflow-tooltip width="150" prop="bag_code" label="袋码" />
<el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip width="150" prop="material_spec" label="物料规格" />

1
wms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
View File

@@ -139,6 +139,7 @@
<el-table-column prop="pcsn" label="批次号" align="center" width="150" />
<!-- <el-table-column prop="sap_pcsn" label="SAP批次号" align="center" />-->
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="bag_code" label="袋码" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column prop="point_code" label="起始位置" align="center" />
<el-table-column prop="struct_code" label="目的位置" align="center" />

138
wms/nladmin-ui/src/views/wms/statement/structivt/BagDialog.vue Normal file
View File

@@ -0,0 +1,138 @@
<template>
<el-dialog
title="袋明细查询"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1000px"
@close="close"
@open="open"
>
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="袋码">
<el-input
v-model="query.bag_code"
clearable
size="mini"
placeholder="袋码编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation />
<!--表格渲染-->
<el-table
ref="deviceTable"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
size="mini"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="bag_code" label="袋码" :min-width="flexWidth('bag_code',crud.data,'袋码')" />
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="status" label="状态" :formatter="formattStatus" :min-width="flexWidth('status',crud.data,'状态')" />
<el-table-column prop="qty" label="组袋重量" :formatter="crud.formatNum3" :min-width="100" />
<el-table-column prop="supp_code" label="供应商" :min-width="flexWidth('supp_code',crud.data,'供应商')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="组袋人" :min-width="flexWidth('create_name',crud.data,'组盘人')" />
<el-table-column prop="create_time" label="组袋时间" :min-width="flexWidth('create_time',crud.data,'组盘时间')" />
</el-table>
<!--分页组件-->
<pagination />
</div>
</el-dialog>
</template>
<script>
import CRUD, { presenter, header } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import crudGroup from '@/views/wms/basedata/group/group'
import rrOperation from '@crud/RR.operation'
export default {
name: 'ReceiveDialog',
dicts: ['GROUP_STATUS'],
components: { crudOperation, pagination, rrOperation },
mixins: [presenter(), header()],
cruds() {
return CRUD({
url: 'api/group',
idField: 'group_id',
sort: 'group_id,desc',
crudMethod: { ... crudGroup },
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: false
}
})
},
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: String
}
},
data() {
return {
dialogVisible: false,
openParamOne: null,
bagDialog: false
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
this.crud.query.storagevehicle_code = this.openParam
}
}
},
methods: {
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done()
})
.catch(_ => {
})
},
close() {
this.$emit('update:dialogShow', false)
},
formattStatus(row) {
return this.dict.label.GROUP_STATUS[row.status]
},
open() {
this.crud.toQuery()
}
}
}
</script>
<style scoped>
</style>

15
wms/nladmin-ui/src/views/wms/statement/structivt/index.vue
View File

@@ -88,7 +88,7 @@
<el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
<el-table-column prop="storagevehicle_code" label="载具号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row.vehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
<el-link type="warning" @click="openBucket(scope.row)">{{ scope.row.storagevehicle_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="canuse_qty" label="可用数" :formatter="crud.formatNum3" :min-width="100" />
@@ -99,13 +99,15 @@
</el-table>
<!--分页组件-->
<pagination />
<image-modal :visible.sync="showModal" :image-url="imageUrl" />
<!-- <image-modal :visible.sync="showModal" :image-url="imageUrl" />-->
<BagDialog :dialog-show.sync="bagDialog" :open-param="openParam" />
</div>
</div>
</template>
<script>
import crudStructivt from '@/views/wms/statement/structivt/structivt'
import BagDialog from '@/views/wms/statement/structivt/BagDialog'
import CRUD, { presenter, header, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -113,11 +115,10 @@ import pagination from '@crud/Pagination'
import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import imageModal from './image'
export default {
name: 'Structivt',
components: { pagination, crudOperation, rrOperation, imageModal },
components: { pagination, crudOperation, rrOperation, BagDialog },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
@@ -136,6 +137,8 @@ export default {
data() {
return {
sects: [],
openParam: null,
bagDialog: false,
showModal: false,
imageUrl: '',
permission: {},
@@ -163,6 +166,10 @@ export default {
}
)
},
openBucket(row) {
this.openParam = row.storagevehicle_code
this.bagDialog = true
},
sectQueryChange(val) {
if (val.length === 1) {
this.query.stor_id = val[0]