From f23bb88d6359ba2fab42a50e40b492b4f9d90fc5 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 16 Aug 2023 11:51:08 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderExt/dao/MpsSaleOrderIcExt.java | 5 + .../MpsSaleOrderIcExtController.java | 21 ++-- .../Engrave/EngraveSendEmpTask.java | 2 +- .../plotter/PlotterCallEmptyTask.java | 2 +- .../plotter/PlotterSendMaterialTask.java | 2 +- .../extendtask/wash/WashCallEmptyTask.java | 2 +- .../extendtask/wash/WashMachineryTask.java | 2 +- .../wash/WashSendMaterialQZTask.java | 2 +- .../impl/StIvtIostorinvBcpOutServiceImpl.java | 1 + .../impl/StIvtIostorinvBcpServiceImpl.java | 1 + .../wms/old_manage/old_package/index.vue | 116 ++++++++++++------ .../old_package}/orderExt.js | 10 +- 12 files changed, 112 insertions(+), 54 deletions(-) rename mes/qd/src/views/wms/{product_manage/workorder => old_manage/old_package}/orderExt.js (62%) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java index 24e1cbc6..3dadd390 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java @@ -33,6 +33,11 @@ public class MpsSaleOrderIcExt implements Serializable { */ private String sale_id; + /** + * 销售单编号 + */ + private String sale_code; + /** * 明细序号 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java index 4c68aa6e..b421393d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; /** @@ -46,6 +47,15 @@ public class MpsSaleOrderIcExtController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/getQuery") + @Log("新增订单扩展表") + //("新增订单扩展表") + public ResponseEntity query(@RequestBody JSONObject whereJson) { + MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper() + .eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code"))); + return new ResponseEntity<>(one,HttpStatus.OK); + } + @PostMapping("/getExtList") @Log("根据工单获取条码") //("根据工单获取条码") @@ -62,13 +72,14 @@ public class MpsSaleOrderIcExtController { }else { print_no = one.getPrint_no(); } - List barCodes = new ArrayList<>(); + LinkedList barCodes = new LinkedList<>(); for (int i =0;i(barCodes,HttpStatus.OK); } - public static void main(String[] args) { - int print_no = 0; - for (int i =0;i<5;i++){ - String bar_code = String.format("%05d", print_no + i+1); - System.out.println(bar_code); - } - System.out.println(print_no + 5); - } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveSendEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveSendEmpTask.java index c2b404a6..a708bc9c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveSendEmpTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveSendEmpTask.java @@ -120,7 +120,7 @@ public class EngraveSendEmpTask extends AbstractAcsTask { task.put("is_send", true); task.put("create_name", SecurityUtils.getCurrentNickName()); task.put("create_time", DateUtil.now()); - task.put("priority", "1"); + task.put("priority", "7"); task.put("finished_type", "1"); task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterCallEmptyTask.java index b41ca945..27908e22 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterCallEmptyTask.java @@ -167,7 +167,7 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { task.put("update_name", SecurityUtils.getCurrentNickName()); task.put("create_time", DateUtil.now()); task.put("update_time", DateUtil.now()); - task.put("priority", "1"); + task.put("priority", "7"); task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); task.put("table_fk_id", fk); return task; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterSendMaterialTask.java index e897de50..6f2c8bf8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterSendMaterialTask.java @@ -146,7 +146,7 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { task.put("is_send", true); task.put("create_name", SecurityUtils.getCurrentNickName()); task.put("create_time", DateUtil.now()); - task.put("priority", "1"); + task.put("priority", "7"); task.put("finished_type", "1"); task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); task.put("table_fk_id",order.getWorkorder_code()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java index 3a88c4f7..37099573 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java @@ -168,7 +168,7 @@ public class WashCallEmptyTask extends AbstractAcsTask { task.put("update_name", SecurityUtils.getCurrentNickName()); task.put("create_time", DateUtil.now()); task.put("update_time", DateUtil.now()); - task.put("priority", "1"); + task.put("priority", "8"); task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); return task; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashMachineryTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashMachineryTask.java index 93730b2f..c205a721 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashMachineryTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashMachineryTask.java @@ -137,7 +137,7 @@ public class WashMachineryTask extends AbstractAcsTask { task.put("create_name", SecurityUtils.getCurrentNickName()); task.put("create_time", DateUtil.now()); task.put("is_auto_issue", false); - task.put("priority", "1"); + task.put("priority", "8"); task.put("task_step", 1); task.put("material_id",devices.get(0).getMaterial_id()); task.put("material_qty",devices.stream().mapToInt(a->a.getDeviceinstor_weight().intValue()).sum()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java index bdc804a6..45ce9de8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java @@ -133,7 +133,7 @@ public class WashSendMaterialQZTask extends AbstractAcsTask { task.put("create_time", DateUtil.now()); task.put("is_send",true); task.put("is_auto_issue",false); - task.put("priority", "1"); + task.put("priority", "8"); task.put("finished_type", "1"); task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); task.put("table_fk_id",washTask!=null?washTask.getTask_id():""); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java index e637b18e..a94ef585 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java @@ -478,6 +478,7 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl @@ -26,7 +25,6 @@ @@ -37,7 +35,6 @@ v-model="query.tray_full_num" clearable size="small" - precision="0" /> @@ -47,7 +44,6 @@ v-model="query.box_type" clearable size="mini" - placeholder="箱型" /> @@ -62,7 +58,6 @@ placeholder="请选择" class="filter-item" style="width: 180px;" - @change="hand" > 打印 @@ -164,7 +159,6 @@ style="width: 200px;" :options="sects" clearable - @change="sectChange" /> @@ -268,6 +262,37 @@ 确认 + + + + + + + + + + + + + + + 重置箱号 + + + + 取 消 + 确 定 + + 1) { this.$refs.table.clearSelection() @@ -508,7 +536,6 @@ export default { this.crud.notify('缺少开工必要参数，保证输入框内不能为空！', CRUD.NOTIFICATION_TYPE.INFO) return } - debugger this.currentRow.extra_map = this.crud.query this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty) this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty) @@ -551,36 +578,49 @@ export default { this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }) }, - print() { - debugger - if (!this.currentRow.workorder_code) { - this.crud.notify('请选择一条工单记录进行打印', CRUD.NOTIFICATION_TYPE.INFO) - return - } - orderExt.getExtList(this.currentRow).then(res => { - if (res.length == 0 || !res) { - this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO) - return - } - res.forEach((item) => { - const LODOP = getLodop() - LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 - // 打印纸张大小设置https://www.it610.com/article/2094844.html - LODOP.SET_PRINT_PAGESIZE(1, '80mm', '50mm', '') - // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1) - LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '25mm', '128Auto', item.bar_code) - LODOP.SET_PRINT_STYLEA(0, 'ShowBarText', 0) - LODOP.ADD_PRINT_TEXT('35mm', '22mm', '40mm', '20mm', item.bar_code.substring(0, 9)) - LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20) - LODOP.ADD_PRINT_TEXT('42mm', '25mm', '40mm', '20mm', item.bar_code.substring(9, 16)) - console.log(item.barcode) - LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20) - LODOP.PRINT()// 打印 - // LODOP.PREVIEW() - }) + printFormm(){ + const param ={"sale_id":this.form.sale_id,"material_code":this.form.material_code} + orderExt.getQuery(param).then(res => { + if (res.length == 0 || !res) { + this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO) + return + } }) - this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() + }, + close(){ + this.printForm = {}, + this.dialogVisible =false + }, + print(){ + this.dialogVisible =true + // if (!this.currentRow.workorder_code) { + // this.crud.notify('请选择一条工单记录进行打印', CRUD.NOTIFICATION_TYPE.INFO) + // return + // } + // orderExt.getExtList(this.currentRow).then(res => { + // if (res.length == 0 || !res) { + // this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO) + // return + // } + // res.forEach((item) => { + // const LODOP = getLodop() + // LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 + // // 打印纸张大小设置https://www.it610.com/article/2094844.html + // LODOP.SET_PRINT_PAGESIZE(1, '80mm', '50mm', '') + // // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1) + // LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '25mm', '128Auto', item.bar_code) + // LODOP.SET_PRINT_STYLEA(0, 'ShowBarText', 0) + // LODOP.ADD_PRINT_TEXT('35mm', '22mm', '40mm', '20mm', item.bar_code.substring(0, 9)) + // LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20) + // LODOP.ADD_PRINT_TEXT('42mm', '25mm', '40mm', '20mm', item.bar_code.substring(9, 16)) + // console.log(item.barcode) + // LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20) + // LODOP.PRINT()// 打印 + // // LODOP.PREVIEW() + // }) + // }) + // this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + // this.crud.toQuery() }, // 改变状态 format_is_used(is_used) { diff --git a/mes/qd/src/views/wms/product_manage/workorder/orderExt.js b/mes/qd/src/views/wms/old_manage/old_package/orderExt.js similarity index 62% rename from mes/qd/src/views/wms/product_manage/workorder/orderExt.js rename to mes/qd/src/views/wms/old_manage/old_package/orderExt.js index 5e0f8750..303e34a2 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/orderExt.js +++ b/mes/qd/src/views/wms/old_manage/old_package/orderExt.js @@ -16,4 +16,12 @@ export function getExtList(data) { }) } -export default { add, getExtList } +export function getQuery(data) { + return request({ + url: 'api/mpsSaleOrderIcExt/getQuery', + method: 'post', + data + }) +} + +export default { add, getExtList, getQuery }