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

rev：优化

Browse Source
This commit is contained in:
liuxy
2025-06-23 11:16:57 +08:00
parent 24dc3f852c
commit ca1b251d79
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
View File

@@ -147,6 +147,8 @@ public class PdaIosInServiceImpl implements PdaIosInService {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("group_id", groupDao.getGroup_id()); result.put("group_id", groupDao.getGroup_id());
result.put("material_code", material_code); result.put("material_code", material_code);
result.put("material_name", materDao.getMaterial_name());
result.put("material_spec", materDao.getMaterial_spec());
result.put("pcsn", pcsn); result.put("pcsn", pcsn);
result.put("qty", qty); result.put("qty", qty);
result.put("qty_unit_name", unitDao.getUnit_name()); result.put("qty_unit_name", unitDao.getUnit_name());

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

@@ -6,7 +6,8 @@
SELECT SELECT
late.*, late.*,
mater.material_code, mater.material_code,
mater.material_name mater.material_name,
mater.material_spec
FROM FROM
md_pb_groupplate late md_pb_groupplate late
LEFT JOIN md_me_materialbase mater ON mater.material_id = late.material_id LEFT JOIN md_me_materialbase mater ON mater.material_id = late.material_id
@@ -23,7 +24,8 @@
SELECT SELECT
late.*, late.*,
mater.material_code, mater.material_code,
mater.material_name mater.material_name,
mater.material_spec
FROM FROM
md_pb_groupplate late md_pb_groupplate late
INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id INNER JOIN md_me_materialbase mater ON mater.material_id = late.material_id

1
wms/nladmin-ui/src/views/wms/basedata/group/index.vue
View File

@@ -71,6 +71,7 @@
<el-table-column prop="storagevehicle_code" label="载具编码" :min-width="flexWidth('storagevehicle_code',crud.data,'载具编码')" /> <el-table-column prop="storagevehicle_code" label="载具编码" :min-width="flexWidth('storagevehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_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_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="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="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="qty" label="组盘数量" :formatter="crud.formatNum3" :min-width="100" />