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

rev：修改

Browse Source
This commit is contained in:
liuxy
2026-02-02 10:15:25 +08:00
parent 1311bfb8ab
commit 9019b243e0
10 changed files with 101 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java
View File

@@ -29,7 +29,7 @@ public class Init implements ApplicationRunner {
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
// initTwoAttr(4,30,3,2, "2"); // initTwoAttr(4,30,3,2, "2");
// createAttr(); // createAttr();
// initTwoAttr2(9,11,3); // initTwoAttr2(4,10,3);
} }
@@ -66,15 +66,15 @@ public class Init implements ApplicationRunner {
col_num = "0" + i; col_num = "0" + i;
} }
String struct_code = "B" + row + "-" + col_num + "-" + layer_num + ""; String struct_code = "Z" + row + "-" + col_num + "-" + layer_num + "";
// 新增仓位 // 新增仓位
json.setSect_id("1945408460665524224"); json.setSect_id("1993215690856861696");
json.setSect_code("ZC01"); json.setSect_code("ZZC01");
json.setSect_name("主存区"); json.setSect_name("中间站（2）主存区");
json.setStor_id("1582991156504039424"); json.setStor_id("1582991156504039423");
json.setStor_code("BA01"); json.setStor_code("ZJZ01");
json.setStor_name("北安仓库"); json.setStor_name("中间站（2）仓库");
json.setLock_type("0"); json.setLock_type("0");
json.setRow_num(BigDecimal.valueOf(row_num)); json.setRow_num(BigDecimal.valueOf(row_num));
@@ -83,17 +83,9 @@ public class Init implements ApplicationRunner {
json.setBlock_num(BigDecimal.valueOf(1)); json.setBlock_num(BigDecimal.valueOf(1));
json.setStruct_code(struct_code); json.setStruct_code(struct_code);
json.setStruct_name(row + "排" + col_num+ "列"+ layer_num +"层"); json.setStruct_name("Z"+row + "排" + col_num+ "列"+ layer_num +"层");
json.setSimple_name(json.getStruct_name()); json.setSimple_name(json.getStruct_name());
// 长宽高
json.setZdepth(BigDecimal.valueOf(2700));
json.setWidth(BigDecimal.valueOf(1100));
json.setHeight(BigDecimal.valueOf(4000));
// 载具类型
json.setStoragevehicle_type("3");
json.setCreate_id("1"); json.setCreate_id("1");
json.setCreate_name("管理员"); json.setCreate_name("管理员");
json.setCreate_time(DateUtil.now()); json.setCreate_time(DateUtil.now());

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

@@ -138,9 +138,4 @@ public class MdCsSupplierbase implements Serializable {
*/ */
private String remark; private String remark;
/**
* 质量代码
*/
private String quality_code;
} }

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

@@ -192,5 +192,10 @@ public class MdMeMaterialbase implements Serializable {
*/ */
private String supp_code; private String supp_code;
/**
* 质量代码
*/
private String quality_code;
} }

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

@@ -6,8 +6,7 @@
SELECT SELECT
mater.*, mater.*,
class.class_name, class.class_name,
supp.supp_name, supp.supp_name
supp.quality_code
FROM FROM
md_me_materialbase mater md_me_materialbase mater
LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id
@@ -30,8 +29,7 @@
class.class_code, class.class_code,
unit.unit_code, unit.unit_code,
unit.unit_name, unit.unit_name,
supp.supp_name, supp.supp_name
supp.quality_code
FROM FROM
md_me_materialbase mater md_me_materialbase mater
LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id
@@ -44,6 +42,7 @@
AND AND
(mater.material_code LIKE '%${param.class_code}%' or (mater.material_code LIKE '%${param.class_code}%' or
mater.material_name LIKE '%${param.class_code}%'or mater.material_name LIKE '%${param.class_code}%'or
mater.quality_code LIKE '%${param.class_code}%'or
class.class_code LIKE '%${param.class_code}%') class.class_code LIKE '%${param.class_code}%')
</if> </if>

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBagParam.java
View File

@@ -22,7 +22,6 @@ public class AssemblyBagParam {
private String bagNo; private String bagNo;
@NotBlank(message = "物料不能为空") @NotBlank(message = "物料不能为空")
private String materialId; private String materialId;
@NotBlank(message = "供应商不能为空")
private String suppCode; private String suppCode;
@NotBlank(message = "批次号不能为空") @NotBlank(message = "批次号不能为空")
private String pcsn; private String pcsn;

1
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBucketParam.java
View File

@@ -21,7 +21,6 @@ public class AssemblyBucketParam {
private String material_id; private String material_id;
@NotBlank(message = "批次号不能为空") @NotBlank(message = "批次号不能为空")
private String pcsn; private String pcsn;
@NotNull(message = "数量不能为空")
private BigDecimal qty; private BigDecimal qty;
} }

4
wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue
View File

@@ -404,9 +404,9 @@ export default {
LODOP.ADD_PRINT_LINE(320, 265, 254, 265, 0, 1) LODOP.ADD_PRINT_LINE(320, 265, 254, 265, 0, 1)
LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bag_code + '') LODOP.ADD_PRINT_BARCODE('107.13mm', '22.99mm', '57.1mm', '10.74mm', '128A', row.bag_code + '')
LODOP.PRINT()// 打印 // LODOP.PRINT()// 打印
// LODOP.PREVIEW()// 预览 // LODOP.PREVIEW()// 预览
// LODOP.PRINT_DESIGN() LODOP.PRINT_DESIGN()
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery() this.crud.toQuery()

2
wms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -103,7 +103,7 @@
> >
<el-table-column prop="material_code" label="物料编码" width="160" /> <el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip /> <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="quality_code" label="供应商质量代码" width="140" /> <el-table-column prop="quality_code" label="质量代码" width="140" />
<el-table-column prop="supp_name" label="供应商名称" width="200" /> <el-table-column prop="supp_name" label="供应商名称" width="200" />
<el-table-column prop="class_name" label="物料分类" width="140" /> <el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" /> <el-table-column prop="unit_name" label="计量单位" />

69
wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue
View File

@@ -109,16 +109,26 @@
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"> <crudOperation :permission="permission">
<!-- <el-button--> <!-- <el-button-->
<!-- slot="right"--> <!-- slot="right"-->
<!-- class="filter-item"--> <!-- class="filter-item"-->
<!-- type="warning"--> <!-- type="warning"-->
<!-- icon="el-icon-check"--> <!-- icon="el-icon-check"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- @click="openOneCreate"--> <!-- @click="openOneCreate"-->
<!-- >--> <!-- >-->
<!-- 一键生成--> <!-- 一键生成-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
@click="print"
>
打印
</el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
@@ -274,26 +284,24 @@
style="width: 100%;" style="width: 100%;"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<!--
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
-->
<el-table-column prop="struct_code" label="仓位编码" :min-width="flexWidth('struct_code',crud.data,'仓位编码')" /> <el-table-column prop="struct_code" label="仓位编码" :min-width="flexWidth('struct_code',crud.data,'仓位编码')" />
<el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" /> <el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
<el-table-column prop="simple_name" label="仓位简称" :min-width="flexWidth('simple_name',crud.data,'仓位简称')" /> <!-- <el-table-column prop="simple_name" label="仓位简称" :min-width="flexWidth('simple_name',crud.data,'仓位简称')" />-->
<el-table-column prop="sect_name" label="所属库区" width="150" /> <el-table-column prop="stor_name" label="所属仓库" :min-width="flexWidth('stor_name',crud.data,'所属仓库')" />
<el-table-column prop="stor_name" label="所属仓库" width="150" /> <el-table-column prop="sect_name" label="所属库区" :min-width="flexWidth('sect_name',crud.data,'所属库区')" />
<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="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip> <el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.d_lock_type[scope.row.lock_type] }} {{ dict.label.d_lock_type[scope.row.lock_type] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sect_name" label="库区名称" /> <!-- <el-table-column prop="sect_name" label="库区名称" />-->
<el-table-column prop="placement_type" label="放置类型" min-width="120" show-overflow-tooltip> <!-- <el-table-column prop="placement_type" label="放置类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.placement_type[scope.row.placement_type] }} {{ dict.label.placement_type[scope.row.placement_type] }}
</template> </template>
</el-table-column> </el-table-column>-->
<!-- <el-table-column prop="storagevehicle_type" label="存放类型" min-width="120" show-overflow-tooltip> <!-- <el-table-column prop="storagevehicle_type" label="存放类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.store_type[scope.row.storagevehicle_type] }} {{ dict.label.store_type[scope.row.storagevehicle_type] }}
@@ -313,7 +321,7 @@
<el-table-column prop="taskdtl_type" label="锁定任务类型" width="150" :formatter="taskdtl_typeFormat" /> <el-table-column prop="taskdtl_type" label="锁定任务类型" width="150" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_code" label="锁定任务编码" width="150" /> <el-table-column prop="task_code" label="锁定任务编码" width="150" />
<el-table-column prop="inv_code" label="锁定单据编码" width="150" /> <el-table-column prop="inv_code" label="锁定单据编码" width="150" />
<el-table-column prop="inv_type" label="锁定单据类型" width="150" :formatter="invtypeFormat" /> <!-- <el-table-column prop="inv_type" label="锁定单据类型" width="150" :formatter="invtypeFormat" />-->
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column <el-table-column
v-permission="['admin','structattr:edit','structattr:del']" v-permission="['admin','structattr:edit','structattr:del']"
@@ -333,7 +341,7 @@
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />
</div> </div>
<!-- <OneCreateDialog :dialog-show.sync="openOneCreateDialog" />--> <!-- <OneCreateDialog :dialog-show.sync="openOneCreateDialog" />-->
</div> </div>
</template> </template>
@@ -347,6 +355,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import OneCreateDialog from '@/views/wms/basedata/structattr/OneCreateDialog' import OneCreateDialog from '@/views/wms/basedata/structattr/OneCreateDialog'
import crudSectattr from '@/views/wms/basedata/sectattr/sectattr' import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
const defaultForm = { const defaultForm = {
struct_id: null, struct_id: null,
@@ -559,6 +568,26 @@ export default {
}) })
}).catch(() => { }).catch(() => {
}) })
},
print() {
const _selectData = this.$refs.table.selection
if (!_selectData || _selectData.length < 1) {
this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
return
}
for (let i = 0; i < _selectData.length; i++) {
const code = _selectData[i].struct_code
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '')
// LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1)
LODOP.ADD_PRINT_BARCODE('4.3mm', '8.2mm', '40mm', '20mm', '128Auto', code)
// LODOP.PREVIEW()// 预览
LODOP.PRINT()// 打印
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}
} }
} }
} }

31
wms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -110,6 +110,16 @@
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"> <crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
@click="print"
>
打印
</el-button>
<el-button <el-button
v-if="crud.query.is_used == 'false'" v-if="crud.query.is_used == 'false'"
slot="right" slot="right"
@@ -403,6 +413,7 @@ import pagination from '@crud/Pagination'
import ViewDialog from '@/views/wms/sch/point/ViewDialog' import ViewDialog from '@/views/wms/sch/point/ViewDialog'
import PointDialog from '@/views/wms/sch/point/PointDialog' import PointDialog from '@/views/wms/sch/point/PointDialog'
import Sectattr from '@/views/wms/basedata/sectattr/sectattr' import Sectattr from '@/views/wms/basedata/sectattr/sectattr'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
const defaultForm = { const defaultForm = {
point_code: null, point_code: null,
@@ -603,6 +614,26 @@ export default {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery() this.crud.toQuery()
}) })
},
print() {
const _selectData = this.$refs.table.selection
if (!_selectData || _selectData.length < 1) {
this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
return
}
for (let i = 0; i < _selectData.length; i++) {
const code = _selectData[i].point_code
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '')
// LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1)
LODOP.ADD_PRINT_BARCODE('4.3mm', '8.2mm', '40mm', '20mm', '128Auto', code)
// LODOP.PREVIEW()// 预览
LODOP.PRINT()// 打印
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}
} }
} }
} }