diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java index eee9df9..e69783a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java @@ -29,7 +29,7 @@ public class Init implements ApplicationRunner { public void run(ApplicationArguments args) throws Exception { // initTwoAttr(4,30,3,2, "2"); // createAttr(); -// initTwoAttr2(9,11,3); +// initTwoAttr2(4,10,3); } @@ -66,15 +66,15 @@ public class Init implements ApplicationRunner { 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_code("ZC01"); - json.setSect_name("主存区"); - json.setStor_id("1582991156504039424"); - json.setStor_code("BA01"); - json.setStor_name("北安仓库"); + json.setSect_id("1993215690856861696"); + json.setSect_code("ZZC01"); + json.setSect_name("中间站（2）主存区"); + json.setStor_id("1582991156504039423"); + json.setStor_code("ZJZ01"); + json.setStor_name("中间站（2）仓库"); json.setLock_type("0"); json.setRow_num(BigDecimal.valueOf(row_num)); @@ -83,17 +83,9 @@ public class Init implements ApplicationRunner { json.setBlock_num(BigDecimal.valueOf(1)); 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.setZdepth(BigDecimal.valueOf(2700)); - json.setWidth(BigDecimal.valueOf(1100)); - json.setHeight(BigDecimal.valueOf(4000)); - - // 载具类型 - json.setStoragevehicle_type("3"); - json.setCreate_id("1"); json.setCreate_name("管理员"); json.setCreate_time(DateUtil.now()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java index 80e4146..58dcc7b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java @@ -138,9 +138,4 @@ public class MdCsSupplierbase implements Serializable { */ private String remark; - /** - * 质量代码 - */ - private String quality_code; - } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java index 1c9cde0..8c80dac 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java @@ -192,5 +192,10 @@ public class MdMeMaterialbase implements Serializable { */ private String supp_code; + /** + * 质量代码 + */ + private String quality_code; + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml index fa31423..273a39e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml @@ -6,8 +6,7 @@ SELECT mater.*, class.class_name, - supp.supp_name, - supp.quality_code + supp.supp_name FROM md_me_materialbase mater LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id @@ -30,8 +29,7 @@ class.class_code, unit.unit_code, unit.unit_name, - supp.supp_name, - supp.quality_code + supp.supp_name FROM md_me_materialbase mater LEFT JOIN md_pb_classstandard class ON class.class_id = mater.material_type_id @@ -44,6 +42,7 @@ AND (mater.material_code 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}%') diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBagParam.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBagParam.java index 093ed48..aac2a33 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBagParam.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBagParam.java @@ -22,7 +22,6 @@ public class AssemblyBagParam { private String bagNo; @NotBlank(message = "物料不能为空") private String materialId; - @NotBlank(message = "供应商不能为空") private String suppCode; @NotBlank(message = "批次号不能为空") private String pcsn; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBucketParam.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBucketParam.java index ab9c437..4606446 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBucketParam.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/dto/AssemblyBucketParam.java @@ -21,7 +21,6 @@ public class AssemblyBucketParam { private String material_id; @NotBlank(message = "批次号不能为空") private String pcsn; - @NotNull(message = "数量不能为空") private BigDecimal qty; } diff --git a/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue index 33f53ea..4faeadb 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue @@ -404,9 +404,9 @@ export default { 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.PRINT()// 打印 + // LODOP.PRINT()// 打印 // LODOP.PREVIEW()// 预览 - // LODOP.PRINT_DESIGN() + LODOP.PRINT_DESIGN() this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() diff --git a/wms/nladmin-ui/src/views/wms/basedata/material/index.vue b/wms/nladmin-ui/src/views/wms/basedata/material/index.vue index 1934d18..cb9e80e 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -103,7 +103,7 @@ > - + diff --git a/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue b/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue index 9c2be17..536211d 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue @@ -109,16 +109,26 @@ - - - - - - - - - - + + + + + + + + + + + + 打印 + @@ -274,27 +284,25 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - + + + - - + + + - + @@ -347,6 +355,7 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import OneCreateDialog from '@/views/wms/basedata/structattr/OneCreateDialog' import crudSectattr from '@/views/wms/basedata/sectattr/sectattr' +import { getLodop } from '@/assets/js/lodop/LodopFuncs' const defaultForm = { struct_id: null, @@ -559,6 +568,26 @@ export default { }) }).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() + } } } } diff --git a/wms/nladmin-ui/src/views/wms/sch/point/index.vue b/wms/nladmin-ui/src/views/wms/sch/point/index.vue index ce9df5e..fbc5f31 100644 --- a/wms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/wms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -110,6 +110,16 @@ + + 打印 +