From 38feec1324d388cb34a4e0502e3356710147fff8 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 23 May 2023 13:57:20 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=96=B0=E5=A2=9E=E8=80=81=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E5=B7=A5=E5=8D=95=E4=B8=8B=E5=8F=91=E5=92=8C=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oderExt/MpsSaleOrderIcExtController.java | 48 +++ .../dao/mapper/PdmProduceWorkorderMapper.xml | 3 + .../service/workorder/dto/WorkorderQuery.java | 1 + .../impl/IPdmProduceWorkorderServiceImpl.java | 179 +++++----- .../wms/old_manage/old_package/index.vue | 324 +++++++++++++----- .../wms/product_manage/workorder/orderExt.js | 19 + .../workorder/produceshiftorder.js | 2 +- 7 files changed, 408 insertions(+), 168 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java create mode 100644 mes/qd/src/views/wms/product_manage/workorder/orderExt.js diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java new file mode 100644 index 00000000..15c7e88d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java @@ -0,0 +1,48 @@ +package org.nl.wms.mps.controller.oderExt; + + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.wms.mps.service.orderExt.IMpsSaleOrderIcExtService; +import org.nl.wms.mps.service.orderExt.dao.MpsSaleOrderIcExt; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 生产订单扩展表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-22 + */ +@RestController +@RequestMapping("/api/mpsSaleOrderIcExt") +public class MpsSaleOrderIcExtController { + + @Autowired + private IMpsSaleOrderIcExtService extService; + + @PostMapping + @Log("新增订单扩展表") + @ApiOperation("新增订单扩展表") + public ResponseEntity create(@RequestBody JSONObject whereJson) { + extService.create(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/getExtList") + @Log("根据工单获取条码") + @ApiOperation("根据工单获取条码") + public ResponseEntity getExtList(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(extService.list(new QueryWrapper().eq("remark1",whereJson.getString("workorder_code"))),HttpStatus.OK); + } +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml index db100b8a..56ec0f9e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml @@ -27,6 +27,9 @@ and ShiftOrder.shift_type_scode = #{query.shift_type_scode} + + and pro.workprocedure_code = #{query.workprocedure_code} + and ShiftOrder.product_area = #{query.product_area} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java index 4e43b6b5..9a15a8b1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java @@ -20,6 +20,7 @@ public class WorkorderQuery extends BaseQuery { private String workorder_code; private String material; private String workorder_status; + private String workprocedure_code; private String sale_id; private String shift_type_scode; private String product_series; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 27a74b13..df9e9713 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -67,26 +67,26 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); List result = pdmProduceWorkorderMapper.pageQuery(query); TableDataInfo build = TableDataInfo.build(result); build.setTotalElements(page.getTotal()); @@ -95,7 +95,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl().eq("workorder_id", form.getString("workorder_id"))); if (one == null) { throw new BadRequestException("被删除或无权限，操作失败!"); @@ -128,48 +128,48 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl getDtl(JSONObject param) { - return this.baseMapper.getworkOrderDtl(param.getString("workorder_id")); + return this.baseMapper.getworkOrderDtl(param.getString("workorder_id")); } @Override public void down(List ids) { - if (ids == null || ids.size()==0){ + if (ids == null || ids.size() == 0) { return; } this.update(new UpdateWrapper() - .set("workorder_status",WorkerOrderEnum.SEND.getCode()) + .set("workorder_status", WorkerOrderEnum.SEND.getCode()) .set("down_id", SecurityUtils.getCurrentUserId()) - .set("down_name",SecurityUtils.getCurrentNickName()) - .set("down_time",new Date()) + .set("down_name", SecurityUtils.getCurrentNickName()) + .set("down_time", new Date()) .in("workorder_id", ids)); - this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE,ids.toArray(new String[0])); + this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, ids.toArray(new String[0])); } @Override public void unDown(List ids) { - if (ids == null || ids.size()==0){ + if (ids == null || ids.size() == 0) { return; } List list = this.list(new QueryWrapper() .ne("workorder_status", WorkerOrderEnum.SEND.getCode()) .in("workorder_id", ids)); - if (list.size()>0){ + if (list.size() > 0) { throw new BadRequestException("只有下发状态的工单才能取消下发"); } this.update(new UpdateWrapper() - .set("workorder_status",WorkerOrderEnum.CREATE.getCode()) + .set("workorder_status", WorkerOrderEnum.CREATE.getCode()) .set("down_id", SecurityUtils.getCurrentUserId()) - .set("down_name",SecurityUtils.getCurrentNickName()) - .set("down_time",new Date()) + .set("down_name", SecurityUtils.getCurrentNickName()) + .set("down_time", new Date()) .in("workorder_id", ids)); - this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE,ids.toArray(new String[0])); + this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, ids.toArray(new String[0])); } @Override @@ -178,10 +178,10 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl() - .set("workorder_status",WorkerOrderEnum.FORCE_COMPLETE.getCode()) + .set("workorder_status", WorkerOrderEnum.FORCE_COMPLETE.getCode()) .set("update_id", SecurityUtils.getCurrentUserId()) - .set("update_name",SecurityUtils.getCurrentNickName()) - .set("update_time",new Date()) + .set("update_name", SecurityUtils.getCurrentNickName()) + .set("update_time", new Date()) .in("workorder_id", workorder_id)); JSONArray array = new JSONArray(); JSONObject map = new JSONObject(); @@ -190,13 +190,13 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl result = wmsToAcsService.orderStatusUpdate(array); if (!HttpStatus.OK.equals(result.get("status"))) { - throw new BadRequestException((String) result.get("message")); + throw new BadRequestException((String) result.get("message")); } - this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE,workorder_id); + this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, workorder_id); } - public void recordWorkOrder(OptionRecord.OptionEnum optionEnum, String...ids) { + public void recordWorkOrder(OptionRecord.OptionEnum optionEnum, String... ids) { List workorders = this.list(new QueryWrapper().in("workorder_id", ids)); for (PdmProduceWorkorder one : workorders) { WorkorderRecord record = WorkorderRecord.builder() @@ -209,7 +209,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl() .eq("device_code", param.getString("device_code")) - .in("workorder_status","2","3","4") - .ne("workorder_id",param.getString("workorder_id"))); - if(ObjectUtil.isNotEmpty(result)) { + .in("workorder_status", "2", "3", "4") + .ne("workorder_id", param.getString("workorder_id"))); + if (ObjectUtil.isNotEmpty(result)) { throw new BadRequestException("已有工单选择该设备开工,请更换开工设备!"); } JSONArray array = new JSONArray(); - result = this.getOne(new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); - JSONObject order = packageForm(result); + + JSONObject order = packageForm(param); array.add(order); //下发acs - result.setWorkorder_status(WorkerOrderEnum.PRODUCTING.getCode()); - Map resp = wmsToAcsService.order(array); - if (((int)resp.get("status")) == (HttpStatus.BAD_REQUEST.value())){ + Map resp = wmsToAcsService.order(array); + PdmProduceWorkorder workOrder = this.getOne(new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); + workOrder.setWorkorder_status(WorkerOrderEnum.PRODUCTING.getCode()); + if (((int) resp.get("status")) == (HttpStatus.BAD_REQUEST.value())) { throw new BadRequestException(String.valueOf(resp.get("message"))); } - this.update(result,new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); - this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE,result.getWorkorder_id()); + this.update(workOrder, new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); + this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, result.getWorkorder_id()); return RestBusinessTemplate.execute(() -> resp); } @NotNull - private JSONObject packageForm(PdmProduceWorkorder workOrder) { + private JSONObject packageForm(JSONObject param) { + PdmProduceWorkorder workOrder = this.getOne(new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); JSONObject form = new JSONObject(); MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper().eq("material_id", workOrder.getMaterial_id())); PdmBiDevice device = deviceService.getOne(new QueryWrapper().eq("device_code", workOrder.getDevice_code())); - form.put("workorder_id",workOrder.getWorkorder_id()); - form.put("workorder_code",workOrder.getWorkorder_code()); + form.put("workorder_id", workOrder.getWorkorder_id()); + form.put("workorder_code", workOrder.getWorkorder_code()); form.put("qty", workOrder.getPlan_qty()); - form.put("outupperlimit_qty",device.getOutupperlimit_qty()); - form.put("material_id",workOrder.getMaterial_id()); - form.put("material_name",material.getMaterial_name()); - form.put("material_code",material.getMaterial_code()); - form.put("material_spec",material.getMaterial_spec()); - form.put("device_code",workOrder.getDevice_code()); - form.put("is_needmove",workOrder.getIs_needmove()); + form.put("outupperlimit_qty", device.getOutupperlimit_qty()); + form.put("material_id", workOrder.getMaterial_id()); + form.put("material_name", material.getMaterial_name()); + form.put("material_code", material.getMaterial_code()); + form.put("material_spec", material.getMaterial_spec()); + form.put("device_code", workOrder.getDevice_code()); + form.put("is_needmove", workOrder.getIs_needmove() ? 1 : 0); + if (param.containsKey("extra_map")) { + form.put("extra_map", param.getJSONObject("extra_map")); + } return form; } @Override @Transactional public Object report(JSONObject param) { - Assert.notNull(new Object[]{param,param.get("report_qty"),param.get("nok_qty"),param.getBigDecimal("repare_qty")},"请求参数不能为空"); + Assert.notNull(new Object[]{param, param.get("report_qty"), param.get("nok_qty"), param.getBigDecimal("repare_qty")}, "请求参数不能为空"); PdmProduceWorkorder workorder = this.getOne(new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); - if (workorder.getWorkorder_status().equals(WorkerOrderEnum.COMPLETE.getCode())||workorder.getWorkorder_status().equals(WorkerOrderEnum.FORCE_COMPLETE.getCode())){ - throw new BadRequestException(param.getString("workorder_id")+"当前工单已经完工不允许报工"); + if (workorder.getWorkorder_status().equals(WorkerOrderEnum.COMPLETE.getCode()) || workorder.getWorkorder_status().equals(WorkerOrderEnum.FORCE_COMPLETE.getCode())) { + throw new BadRequestException(param.getString("workorder_id") + "当前工单已经完工不允许报工"); } PdmProduceWorkorderrecord one = reportRecordService.getOne(new QueryWrapper() .eq("workorder_id", param.getString("workorder_id")).eq("report_status", ReportRecordStatus.CREATE.getCode())); - if ( one == null) { - throw new BadRequestException(param.getString("workorder_id")+"当前工单没有生成状态的报工记录"); + if (one == null) { + throw new BadRequestException(param.getString("workorder_id") + "当前工单没有生成状态的报工记录"); } workorder.setReport_qty(workorder.getReport_qty().add(param.getBigDecimal("report_qty"))); workorder.setNok_qty(workorder.getReport_qty().add(param.getBigDecimal("nok_qty"))); workorder.setRepare_qty(workorder.getReport_qty().add(param.getBigDecimal("repare_qty"))); - if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()){ + if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) { workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode()); } this.updateById(workorder); reportRecordService.update(new UpdateWrapper() - .set("report_qty",param.getBigDecimal("report_qty")) - .set("nok_qty",param.getBigDecimal("nok_qty")) - .set("repare_qty",param.getBigDecimal("repare_qty")) - .set("needproduct_qty",workorder.getPlan_qty().doubleValue()-workorder.getReport_qty().doubleValue()) - .eq("macoperate_id",one.getMacoperate_id())); + .set("report_qty", param.getBigDecimal("report_qty")) + .set("nok_qty", param.getBigDecimal("nok_qty")) + .set("repare_qty", param.getBigDecimal("repare_qty")) + .set("needproduct_qty", workorder.getPlan_qty().doubleValue() - workorder.getReport_qty().doubleValue()) + .eq("macoperate_id", one.getMacoperate_id())); return one.getMacoperate_id(); } @@ -584,7 +589,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl workreportRecords = param.toJavaList(PdmProduceWorkorderrecord.class); - if (!CollectionUtils.isEmpty(workreportRecords)){ + if (!CollectionUtils.isEmpty(workreportRecords)) { List macoperate_ids = workreportRecords.stream().map(PdmProduceWorkorderrecord::getMacoperate_id).collect(Collectors.toList()); List record = reportRecordService.list(new QueryWrapper() .in("macoperate_id", macoperate_ids)); @@ -598,7 +603,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl list = packageWorkorderQty(record, itemRecord); - this.baseMapper.batchUpdateByParam(list,entry.getKey()); + this.baseMapper.batchUpdateByParam(list, entry.getKey()); reportRecordService.updateBatchById(itemRecord); } } @@ -616,19 +621,19 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl list = new ArrayList<>(); Map nok_qty = new HashMap<>(); - nok_qty.put("field","nok_qty"); - nok_qty.put("value",Math.abs(new_nok_qty-old_nok_qty)); - nok_qty.put("add",new_nok_qty>old_nok_qty); + nok_qty.put("field", "nok_qty"); + nok_qty.put("value", Math.abs(new_nok_qty - old_nok_qty)); + nok_qty.put("add", new_nok_qty > old_nok_qty); list.add(nok_qty); Map repare_qty = new HashMap<>(); - repare_qty.put("field","repare_qty"); - repare_qty.put("value",Math.abs(new_repare_qty-old_repare_qty)); - repare_qty.put("add",new_repare_qty>old_repare_qty); + repare_qty.put("field", "repare_qty"); + repare_qty.put("value", Math.abs(new_repare_qty - old_repare_qty)); + repare_qty.put("add", new_repare_qty > old_repare_qty); list.add(repare_qty); Map report_qty = new HashMap<>(); - report_qty.put("field","report_qty"); - report_qty.put("value",Math.abs(new_report_qty-old_report_qty)); - report_qty.put("add",new_report_qty>old_report_qty); + report_qty.put("field", "report_qty"); + report_qty.put("value", Math.abs(new_report_qty - old_report_qty)); + report_qty.put("add", new_report_qty > old_report_qty); list.add(report_qty); return list; } @@ -646,16 +651,16 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl resp = wmsToAcsService.replaceDevice(array); + Map resp = wmsToAcsService.replaceDevice(array); String status = String.valueOf(resp.get("status")); String message = (String) resp.get("message"); - if(!status.equals("200")) { + if (!status.equals("200")) { throw new BadRequestException(message); } } diff --git a/mes/qd/src/views/wms/old_manage/old_package/index.vue b/mes/qd/src/views/wms/old_manage/old_package/index.vue index f5771f1e..f9ae5978 100644 --- a/mes/qd/src/views/wms/old_manage/old_package/index.vue +++ b/mes/qd/src/views/wms/old_manage/old_package/index.vue @@ -6,50 +6,119 @@ :inline="true" class="demo-form-inline" label-position="right" - label-width="80px" + label-width="120px" label-suffix=":" > - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + 开工 + + + 打印 + + - - - - - - - - + + + - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + @@ -257,7 +339,9 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import crudSectattr from '@/api/wms/basedata/st/sectattr' -/* import checkoutbill from "@/api/wms/st/core/outbill/checkoutbill";*/ +import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder' +import { getLodop } from '@/assets/js/lodop/LodopFuncs' +import orderExt from '@/views/wms/product_manage/workorder/orderExt' const defaultForm = { struct_id: null, @@ -306,14 +390,22 @@ const defaultForm = { } export default { name: 'Structattr', - dicts: ['ST_HEIGHT_TYPE', 'd_lock_type', 'SCH_TASK_TYPE_DTL'], + dicts: ['ST_HEIGHT_TYPE', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'IS_OR_NOT', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'PDM_BI_SHIFTTYPE'], components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ title: '仓位', - optShow: { add: true, reset: true }, - url: 'api/structattr', + optShow: { + reset: true + }, + query: { + workorder_status: '2', + product_area: 'A2', + workprocedure_code: 'BZ', + is_error: '0' + }, + url: 'api/produceWorkorder', idField: 'struct_id', crudMethod: { ...crudStructattr } }) @@ -334,7 +426,10 @@ export default { } return { sects: [], + currentRow: null, invtypelist: [], + roadList: ['1', '2', '3', '4', '5', '6', '7'], + confirm_flag: true, permission: {}, rules: { struct_id: [ @@ -382,13 +477,11 @@ export default { crudSectattr.getSect({}).then(res => { this.sects = res.content }) - /* checkoutbill.getInvTypes().then(res => { - this.invtypelist = res - })*/ }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { + this.currentRow = {} return true }, [CRUD.HOOK.afterToEdit](crud, form) { @@ -397,6 +490,33 @@ export default { val[1] = form.sect_id form.cascader = val }, + handleSelectionChange(val, row) { + if (val.length > 1) { + this.$refs.table.clearSelection() + this.$refs.table.toggleRowSelection(val.pop()) + this.buttonChange(row) + } else if (val.length === 1) { + this.buttonChange(row) + } else { + this.handleCurrentChange(null) + } + }, + buttonChange(currentRow) { + if (currentRow !== null) { + this.currentRow = currentRow + this.confirm_flag = false + } + }, + onSelectAll() { + this.$refs.table.clearSelection() + this.handleCurrentChange(null) + }, + handleCurrentChange(currentRow) { + if (currentRow === null) { + this.confirm_flag = true + this.currentRow = {} + } + }, sectChange(val) { this.form.sect_id = val[1] }, @@ -410,6 +530,23 @@ export default { taskdtl_typeFormat(row) { return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type] }, + startWork() { + if (!this.crud.query.one_box_package_qty || !this.crud.query.one_package_qty || !this.crud.query.box_type || + !this.crud.query.target_roadway || !this.crud.query.is_flip || + !this.crud.query.tray_full_num) { + 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) + orderExt.add(this.currentRow).then(res => { + this.notify('操作成功', 'success') + }) + crudProduceshiftorder.openStart(this.currentRow).then(res => { + }) + }, sectQueryChange(val) { if (val.length === 1) { this.query.stor_id = val[0] @@ -425,6 +562,33 @@ export default { } this.crud.toQuery() }, + print() { + if (!this.currentRow) { + this.crud.notify('请选择一条工单记录进行打印', CRUD.NOTIFICATION_TYPE.INFO) + } + orderExt.getExtList(this.currentRow).then(res => { + debugger + const item = res[0] + // 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) { return is_used === true diff --git a/mes/qd/src/views/wms/product_manage/workorder/orderExt.js b/mes/qd/src/views/wms/product_manage/workorder/orderExt.js new file mode 100644 index 00000000..5e0f8750 --- /dev/null +++ b/mes/qd/src/views/wms/product_manage/workorder/orderExt.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/mpsSaleOrderIcExt', + method: 'post', + data + }) +} + +export function getExtList(data) { + return request({ + url: 'api/mpsSaleOrderIcExt/getExtList', + method: 'post', + data + }) +} + +export default { add, getExtList } diff --git a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js index b35c8ca5..380581d2 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js +++ b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js @@ -65,7 +65,7 @@ export function getTable(data) { export function openStart(data) { return request({ - url: 'api/produceWorkorder/openStart', + url: 'api/produceshiftorder/openStart', method: 'post', data })