From fa768ee25572f88cd6f7b2640173f6057e2c1059 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 13 Jul 2023 13:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95init1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/ProOrderController.java | 14 ++++++------- .../main/java/com/op/mes/domain/ProOrder.java | 14 ++++++++++++- .../mes/service/impl/ProOrderServiceImpl.java | 16 +++++++------- .../resources/mapper/mes/ProOrderMapper.xml | 21 ++++++++++++------- 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProOrderController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProOrderController.java index b1e58a5e6..3be4af9b5 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProOrderController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProOrderController.java @@ -22,7 +22,7 @@ import com.op.common.core.utils.poi.ExcelUtil; /** * 订单Controller - * + * * @author Open Platform * @date 2023-07-13 */ @@ -35,7 +35,7 @@ public class ProOrderController extends BaseController { /** * 查询订单列表 */ - @RequiresPermissions("order:order:list") + @RequiresPermissions("mes:pro:order:list") @GetMapping("/list") public AjaxResult list(ProOrder proOrder) { List list = proOrderService.selectProOrderList(proOrder); @@ -45,7 +45,7 @@ public class ProOrderController extends BaseController { /** * 导出订单列表 */ - @RequiresPermissions("order:order:export") + @RequiresPermissions("mes:pro:order:export") @Log(title = "订单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ProOrder proOrder) { @@ -57,7 +57,7 @@ public class ProOrderController extends BaseController { /** * 获取订单详细信息 */ - @RequiresPermissions("order:order:query") + @RequiresPermissions("mes:pro:order:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { return success(proOrderService.selectProOrderById(id)); @@ -66,7 +66,7 @@ public class ProOrderController extends BaseController { /** * 新增订单 */ - @RequiresPermissions("order:order:add") + @RequiresPermissions("mes:pro:order:add") @Log(title = "订单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ProOrder proOrder) { @@ -76,7 +76,7 @@ public class ProOrderController extends BaseController { /** * 修改订单 */ - @RequiresPermissions("order:order:edit") + @RequiresPermissions("mes:pro:order:edit") @Log(title = "订单", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ProOrder proOrder) { @@ -86,7 +86,7 @@ public class ProOrderController extends BaseController { /** * 删除订单 */ - @RequiresPermissions("order:order:remove") + @RequiresPermissions("mes:pro:order:remove") @Log(title = "订单", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java index 4edd88abd..ce2704287 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProOrder.java @@ -9,7 +9,7 @@ import com.op.common.core.web.domain.TreeEntity; /** * 订单对象 pro_order - * + * * @author Open Platform * @date 2023-07-13 */ @@ -43,6 +43,10 @@ public class ProOrder extends TreeEntity { @Excel(name = "订单数量") private Long quantity; + /** 已拆分订单数量 */ + @Excel(name = "已拆分订单数量") + private Long quantitySplit; + /** 单位 */ @Excel(name = "单位") private String unit; @@ -51,6 +55,14 @@ public class ProOrder extends TreeEntity { @Excel(name = "任务清单") private String workerOrder; + public Long getQuantitySplit() { + return quantitySplit; + } + + public void setQuantitySplit(Long quantitySplit) { + this.quantitySplit = quantitySplit; + } + /** 计划生产日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "计划生产日期", width = 30, dateFormat = "yyyy-MM-dd") diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java index 72f6e235f..2c6eb78b9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.op.mes.service.impl; import java.util.List; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.mes.mapper.ProOrderMapper; @@ -10,7 +11,7 @@ import com.op.mes.service.IProOrderService; /** * 订单Service业务层处理 - * + * * @author Open Platform * @date 2023-07-13 */ @@ -21,7 +22,7 @@ public class ProOrderServiceImpl implements IProOrderService { /** * 查询订单 - * + * * @param id 订单主键 * @return 订单 */ @@ -32,7 +33,7 @@ public class ProOrderServiceImpl implements IProOrderService { /** * 查询订单列表 - * + * * @param proOrder 订单 * @return 订单 */ @@ -43,19 +44,20 @@ public class ProOrderServiceImpl implements IProOrderService { /** * 新增订单 - * + * * @param proOrder 订单 * @return 结果 */ @Override public int insertProOrder(ProOrder proOrder) { + proOrder.setId(IdUtils.fastSimpleUUID()); proOrder.setCreateTime(DateUtils.getNowDate()); return proOrderMapper.insertProOrder(proOrder); } /** * 修改订单 - * + * * @param proOrder 订单 * @return 结果 */ @@ -67,7 +69,7 @@ public class ProOrderServiceImpl implements IProOrderService { /** * 批量删除订单 - * + * * @param ids 需要删除的订单主键 * @return 结果 */ @@ -78,7 +80,7 @@ public class ProOrderServiceImpl implements IProOrderService { /** * 删除订单信息 - * + * * @param id 订单主键 * @return 结果 */ diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml index 5c30980f0..e4c7781e9 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -29,12 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, factory_code, order_type, order_code, prod_code, prod_desc, quantity, unit, worker_order, plan_pro_date, plan_complete, atrr1, atrr2, atrr3, status, parent_order, create_by, create_time, update_by, update_time, prod_type from pro_order + select id, factory_code, order_type, order_code, prod_code, prod_desc, quantity, quantity_split + unit, worker_order, plan_pro_date, plan_complete, atrr1, atrr2, atrr3, + status, parent_order, create_by, create_time, update_by, update_time, prod_type + from pro_order - + - + insert into pro_order @@ -69,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" prod_code, prod_desc, quantity, + quantity_split, unit, worker_order, plan_pro_date, @@ -92,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{prodCode}, #{prodDesc}, #{quantity}, + #{quantitySplit}, #{unit}, #{workerOrder}, #{planProDate}, @@ -118,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" prod_code = #{prodCode}, prod_desc = #{prodDesc}, quantity = #{quantity}, + quantity_split = #{quantitySplit}, unit = #{unit}, worker_order = #{workerOrder}, plan_pro_date = #{planProDate}, @@ -141,9 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from pro_order where id in + delete from pro_order where id in #{id} - \ No newline at end of file +