From b53d9eecd3176d04fd4abfb42eb4f3a865fedba5 Mon Sep 17 00:00:00 2001 From: zxy Date: Fri, 17 Apr 2026 11:25:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(example):=20=E5=AE=8C=E5=96=84=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增生产订单、产线订单、机台执行订单相关实体类 - 添加生产订单控制器及服务层实现 - 集成产线选择弹窗组件优化订单生成流程 - 实现生产订单列表、详情、创建、修改、删除功能 - 添加产线分配验证和计划数量校验逻辑 - 优化订单状态管理和分配数量控制 - 重构产线选择方式从下拉框改为弹窗模式 - 更新产线查询接口支持关键词搜索功能 --- .../java/jnpf/mapper/ProOrderLineMapper.java | 17 ++ .../jnpf/mapper/ProOrderMachineMapper.java | 17 ++ .../main/java/jnpf/mapper/ProOrderMapper.java | 17 ++ .../java/jnpf/mapper/ProSoRelationMapper.java | 16 ++ .../java/jnpf/service/ProLineService.java | 2 +- .../jnpf/service/ProOrderLineService.java | 33 +++ .../jnpf/service/ProOrderMachineService.java | 41 ++++ .../java/jnpf/service/ProOrderService.java | 35 ++++ .../jnpf/service/ProSoRelationService.java | 16 ++ .../jnpf/service/impl/ProLineServiceImpl.java | 15 +- .../service/impl/ProOrderLineServiceImpl.java | 42 ++++ .../impl/ProOrderMachineServiceImpl.java | 54 +++++ .../service/impl/ProOrderServiceImpl.java | 86 ++++++++ .../impl/ProSoRelationServiceImpl.java | 20 ++ .../jnpf/controller/ProLineController.java | 4 +- .../jnpf/controller/ProOrderController.java | 122 +++++++++++ .../java/jnpf/model/order/ProOrderEntity.java | 104 ++++++++++ .../java/jnpf/model/order/ProOrderForm.java | 86 ++++++++ .../jnpf/model/order/ProOrderLineEntity.java | 80 ++++++++ .../model/order/ProOrderMachineEntity.java | 85 ++++++++ .../jnpf/model/order/ProOrderPagination.java | 43 ++++ .../java/jnpf/model/order/ProOrderVO.java | 105 ++++++++++ .../jnpf/model/order/ProSoRelationEntity.java | 89 ++++++++ .../jnpf/model/proline/ProLinePagination.java | 2 +- .../jnpf-web/src/router/modules/base.js | 1 - .../src/views/example/proline/select.vue | 190 ++++++++++++++++++ .../views/example/tsoorder/generate/index.vue | 121 ++++++++--- 27 files changed, 1408 insertions(+), 35 deletions(-) create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderLineMapper.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMachineMapper.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMapper.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProSoRelationMapper.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderLineService.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderMachineService.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderService.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProSoRelationService.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderLineServiceImpl.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderMachineServiceImpl.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderServiceImpl.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProSoRelationServiceImpl.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProOrderController.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderEntity.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderForm.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderLineEntity.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderMachineEntity.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderPagination.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderVO.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProSoRelationEntity.java create mode 100644 jnpf-java-boot/jnpf-web/src/views/example/proline/select.vue diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderLineMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderLineMapper.java new file mode 100644 index 0000000..26bc995 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderLineMapper.java @@ -0,0 +1,17 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.order.ProOrderLineEntity; + +/** + * 产线订单 Mapper + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProOrderLineMapper extends BaseMapper { + + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMachineMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMachineMapper.java new file mode 100644 index 0000000..f65b60e --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMachineMapper.java @@ -0,0 +1,17 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.order.ProOrderMachineEntity; + +/** + * 机台执行订单 Mapper + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProOrderMachineMapper extends BaseMapper { + + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMapper.java new file mode 100644 index 0000000..e6cfdfa --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProOrderMapper.java @@ -0,0 +1,17 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.order.ProOrderEntity; + +/** + * 生产订单 Mapper + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProOrderMapper extends BaseMapper { + + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProSoRelationMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProSoRelationMapper.java new file mode 100644 index 0000000..0e5d061 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProSoRelationMapper.java @@ -0,0 +1,16 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.order.ProSoRelationEntity; + +/** + * 生产订单对应销售订单 Mapper + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProSoRelationMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProLineService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProLineService.java index 31f5b62..e164997 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProLineService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProLineService.java @@ -28,6 +28,6 @@ public interface ProLineService extends IService { boolean update(String id, ProLineEntity entity); String checkForm(ProLineForm form, int i); void saveOrUpdate(ProLineForm proLineForm, String id, boolean isSave) throws Exception; - List getSelectList(); + List getSelectList(String keyWord); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderLineService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderLineService.java new file mode 100644 index 0000000..92ce71c --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderLineService.java @@ -0,0 +1,33 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.order.ProOrderLineEntity; + +import java.util.List; + +/** + * 产线订单 Service + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProOrderLineService extends IService { + + /** + * 根据生产订单ID获取产线列表 + * + * @param proId 生产订单ID + * @return 产线订单列表 + */ + List getListByProId(Integer proId); + + /** + * 根据生产订单号获取产线列表 + * + * @param proNo 生产订单号 + * @return 产线订单列表 + */ + List getListByProNo(String proNo); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderMachineService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderMachineService.java new file mode 100644 index 0000000..dba5e2a --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderMachineService.java @@ -0,0 +1,41 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.order.ProOrderMachineEntity; + +import java.util.List; + +/** + * 机台执行订单 Service + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProOrderMachineService extends IService { + + /** + * 根据生产订单ID获取机台列表 + * + * @param proId 生产订单ID + * @return 机台执行订单列表 + */ + List getListByProId(Integer proId); + + /** + * 根据生产订单号获取机台列表 + * + * @param proNo 生产订单号 + * @return 机台执行订单列表 + */ + List getListByProNo(String proNo); + + /** + * 根据产线ID获取机台列表 + * + * @param lineId 产线ID + * @return 机台执行订单列表 + */ + List getListByLineId(Integer lineId); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderService.java new file mode 100644 index 0000000..3812a59 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProOrderService.java @@ -0,0 +1,35 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.order.ProOrderEntity; +import jnpf.model.order.ProOrderPagination; +import jnpf.model.order.ProOrderVO; + +import java.util.List; + +/** + * 生产订单 Service + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProOrderService extends IService { + + /** + * 获取生产订单列表 + * + * @param proOrderPagination 分页查询对象 + * @return 生产订单列表 + */ + List getList(ProOrderPagination proOrderPagination); + + /** + * 根据ID获取生产订单信息 + * + * @param id 主键 + * @return 生产订单信息 + */ + ProOrderVO getInfoById(Integer id); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProSoRelationService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProSoRelationService.java new file mode 100644 index 0000000..8b355ad --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProSoRelationService.java @@ -0,0 +1,16 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.order.ProSoRelationEntity; + +/** + * 生产订单对应销售订单 Service + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +public interface ProSoRelationService extends IService { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java index e19e2f9..f74b430 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java @@ -47,6 +47,11 @@ public class ProLineServiceImpl extends ServiceImpl getSelectList() { + public List getSelectList(String keyWord) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProLineEntity::getDeleteMark, 0); wrapper.eq(ProLineEntity::getEnabledStatus, 1); + if (ObjectUtil.isNotEmpty(keyWord)) { + wrapper.like(ProLineEntity::getProLineName, keyWord).or() + .like(ProLineEntity::getProLineCd, keyWord); + } wrapper.select(ProLineEntity::getId, ProLineEntity::getProLineName); wrapper.orderByAsc(ProLineEntity::getProLineName); return this.list(wrapper); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderLineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderLineServiceImpl.java new file mode 100644 index 0000000..d2df24f --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderLineServiceImpl.java @@ -0,0 +1,42 @@ +package jnpf.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.ProOrderLineMapper; +import jnpf.model.order.ProOrderLineEntity; +import jnpf.service.ProOrderLineService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 产线订单 ServiceImpl + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Service +public class ProOrderLineServiceImpl extends ServiceImpl implements ProOrderLineService { + + @Override + public List getListByProId(Integer proId) { + QueryWrapper query = new QueryWrapper<>(); + query.lambda().eq(ProOrderLineEntity::getProId, proId); + query.lambda().and(wrapper -> wrapper.isNull(ProOrderLineEntity::getDeleteMark) + .or().eq(ProOrderLineEntity::getDeleteMark, 1)); + query.lambda().orderByAsc(ProOrderLineEntity::getLineCd); + return this.list(query); + } + + @Override + public List getListByProNo(String proNo) { + QueryWrapper query = new QueryWrapper<>(); + query.lambda().eq(ProOrderLineEntity::getProNo, proNo); + query.lambda().and(wrapper -> wrapper.isNull(ProOrderLineEntity::getDeleteMark) + .or().eq(ProOrderLineEntity::getDeleteMark, 1)); + query.lambda().orderByAsc(ProOrderLineEntity::getLineCd); + return this.list(query); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderMachineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderMachineServiceImpl.java new file mode 100644 index 0000000..c3595df --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderMachineServiceImpl.java @@ -0,0 +1,54 @@ +package jnpf.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.ProOrderMachineMapper; +import jnpf.model.order.ProOrderMachineEntity; +import jnpf.service.ProOrderMachineService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 机台执行订单 ServiceImpl + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Service +public class ProOrderMachineServiceImpl extends ServiceImpl implements ProOrderMachineService { + + @Override + public List getListByProId(Integer proId) { + QueryWrapper query = new QueryWrapper<>(); + query.lambda().eq(ProOrderMachineEntity::getProId, proId); + query.lambda().and(wrapper -> wrapper.isNull(ProOrderMachineEntity::getDeleteMark) + .or().eq(ProOrderMachineEntity::getDeleteMark, 1)); + query.lambda().orderByAsc(ProOrderMachineEntity::getLineCd) + .orderByAsc(ProOrderMachineEntity::getMachineCd); + return this.list(query); + } + + @Override + public List getListByProNo(String proNo) { + QueryWrapper query = new QueryWrapper<>(); + query.lambda().eq(ProOrderMachineEntity::getProNo, proNo); + query.lambda().and(wrapper -> wrapper.isNull(ProOrderMachineEntity::getDeleteMark) + .or().eq(ProOrderMachineEntity::getDeleteMark, 1)); + query.lambda().orderByAsc(ProOrderMachineEntity::getLineCd) + .orderByAsc(ProOrderMachineEntity::getMachineCd); + return this.list(query); + } + + @Override + public List getListByLineId(Integer lineId) { + QueryWrapper query = new QueryWrapper<>(); + query.lambda().eq(ProOrderMachineEntity::getLineId, lineId); + query.lambda().and(wrapper -> wrapper.isNull(ProOrderMachineEntity::getDeleteMark) + .or().eq(ProOrderMachineEntity::getDeleteMark, 1)); + query.lambda().orderByAsc(ProOrderMachineEntity::getMachineCd); + return this.list(query); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderServiceImpl.java new file mode 100644 index 0000000..0e528c1 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProOrderServiceImpl.java @@ -0,0 +1,86 @@ +package jnpf.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.ProOrderMapper; +import jnpf.model.order.ProOrderEntity; +import jnpf.model.order.ProOrderPagination; +import jnpf.model.order.ProOrderVO; +import jnpf.service.ProOrderService; +import jnpf.util.JsonUtil; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.util.List; + +/** + * 生产订单 ServiceImpl + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Service +public class ProOrderServiceImpl extends ServiceImpl implements ProOrderService { + + @Override + public List getList(ProOrderPagination proOrderPagination) { + QueryWrapper query = new QueryWrapper<>(); + + query.lambda().and(wrapper -> wrapper.isNull(ProOrderEntity::getDeleteMark) + .or().eq(ProOrderEntity::getDeleteMark, 1)); + + if (StringUtils.hasText(proOrderPagination.getProNo())) { + query.lambda().like(ProOrderEntity::getProNo, proOrderPagination.getProNo()); + } + + if (StringUtils.hasText(proOrderPagination.getMaterialCode())) { + query.lambda().like(ProOrderEntity::getMaterialCode, proOrderPagination.getMaterialCode()); + } + + if (StringUtils.hasText(proOrderPagination.getMaterialName())) { + query.lambda().like(ProOrderEntity::getMaterialName, proOrderPagination.getMaterialName()); + } + + if (StringUtils.hasText(proOrderPagination.getPlanStatus())) { + query.lambda().eq(ProOrderEntity::getPlanStatus, proOrderPagination.getPlanStatus()); + } + + if (proOrderPagination.getPlanBgDateStart() != null) { + query.lambda().ge(ProOrderEntity::getPlanBgDate, proOrderPagination.getPlanBgDateStart()); + } + + if (proOrderPagination.getPlanBgDateEnd() != null) { + query.lambda().le(ProOrderEntity::getPlanBgDate, proOrderPagination.getPlanBgDateEnd()); + } + + if (proOrderPagination.getPlanEndDateStart() != null) { + query.lambda().ge(ProOrderEntity::getPlanEndDate, proOrderPagination.getPlanEndDateStart()); + } + + if (proOrderPagination.getPlanEndDateEnd() != null) { + query.lambda().le(ProOrderEntity::getPlanEndDate, proOrderPagination.getPlanEndDateEnd()); + } + + query.lambda().orderByDesc(ProOrderEntity::getProDate) + .orderByDesc(ProOrderEntity::getId); + + Page page = new Page<>(proOrderPagination.getCurrentPage(), proOrderPagination.getPageSize()); + Page entityPage = this.page(page, query); + + proOrderPagination.setTotal((int) entityPage.getTotal()); + + return JsonUtil.getJsonToList(entityPage.getRecords(), ProOrderVO.class); + } + + @Override + public ProOrderVO getInfoById(Integer id) { + ProOrderEntity entity = this.getById(id); + if (entity != null) { + return JsonUtil.getJsonToBean(entity, ProOrderVO.class); + } + return null; + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProSoRelationServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProSoRelationServiceImpl.java new file mode 100644 index 0000000..8948609 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProSoRelationServiceImpl.java @@ -0,0 +1,20 @@ +package jnpf.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.ProSoRelationMapper; +import jnpf.model.order.ProSoRelationEntity; +import jnpf.service.ProSoRelationService; +import org.springframework.stereotype.Service; + +/** + * 生产订单对应销售订单 ServiceImpl + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Service +public class ProSoRelationServiceImpl extends ServiceImpl implements ProSoRelationService { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProLineController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProLineController.java index ac939b7..9919bf8 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProLineController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProLineController.java @@ -118,8 +118,8 @@ public class ProLineController { } @Operation(summary = "获取产线下拉列表") @GetMapping("/getSelectList") - public ActionResult getSelectList() { - List list = proLineService.getSelectList(); + public ActionResult getSelectList(@RequestParam(value = "keyWord", required = false) String selectKey) { + List list = proLineService.getSelectList(selectKey); List> result = list.stream() .map(entity -> { Map map = JsonUtil.entityToMap(entity); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProOrderController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProOrderController.java new file mode 100644 index 0000000..e63cc1c --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProOrderController.java @@ -0,0 +1,122 @@ +package jnpf.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import jnpf.base.ActionResult; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.constant.MsgCode; +import jnpf.model.order.ProOrderEntity; +import jnpf.model.order.ProOrderForm; +import jnpf.model.order.ProOrderPagination; +import jnpf.model.order.ProOrderVO; +import jnpf.service.ProOrderService; +import jnpf.util.JsonUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 生产订单 控制类 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Tag(name = "生产订单", description = "example") +@RestController +@RequestMapping("/api/example/proOrder") +public class ProOrderController { + + @Autowired + private ProOrderService proOrderService; + + /** + * 列表 + * + * @param proOrderPagination 分页查询对象 + * @return 列表结果集 + */ + @Operation(summary = "获取生产订单列表") + @PostMapping("/getList") + public ActionResult> getList(ProOrderPagination proOrderPagination) { + List voList = proOrderService.getList(proOrderPagination); + return ActionResult.page(voList, JsonUtil.getJsonToBean(proOrderPagination, PaginationVO.class)); + } + + /** + * 获取信息 + * + * @param id 主键 + * @return + */ + @Operation(summary = "获取生产订单信息") + @Parameter(name = "id", description = "主键", required = true) + @SaCheckPermission("example.proOrder") + @GetMapping("/{id}") + public ActionResult getInfo(@PathVariable Integer id) { + ProOrderVO vo = proOrderService.getInfoById(id); + if (vo != null) { + return ActionResult.success(vo); + } + return ActionResult.fail("数据不存在"); + } + + /** + * 新建 + * + * @param proOrderForm 实体模型 + * @return + */ + @Operation(summary = "新建生产订单") + @SaCheckPermission("example.proOrder") + @Parameter(name = "proOrderForm", description = "实体模型", required = true) + @PostMapping() + public ActionResult create(@RequestBody ProOrderForm proOrderForm) { + ProOrderEntity entity = JsonUtil.getJsonToBean(proOrderForm, ProOrderEntity.class); + proOrderService.save(entity); + return ActionResult.success(MsgCode.SU001.get()); + } + + /** + * 修改 + * + * @param proOrderForm 实体模型 + * @return + */ + @Operation(summary = "修改生产订单") + @SaCheckPermission("example.proOrder") + @Parameters({ + @Parameter(name = "proOrderForm", description = "实体模型", required = true) + }) + @PutMapping("/{id}") + public ActionResult update(@RequestBody ProOrderForm proOrderForm) { + ProOrderEntity entity = JsonUtil.getJsonToBean(proOrderForm, ProOrderEntity.class); + entity.setId(proOrderForm.getId()); + proOrderService.updateById(entity); + return ActionResult.success(MsgCode.SU004.get()); + } + + /** + * 删除 + * + * @param id 主键 + * @return + */ + @Operation(summary = "删除生产订单") + @DeleteMapping("/delete/{id}") + public ActionResult delete(@PathVariable("id") Integer id) { + ProOrderEntity byId = proOrderService.getById(id); + if (ObjectUtil.isNotEmpty(byId)) { + proOrderService.removeById(id); + return ActionResult.success("删除成功"); + } + return ActionResult.success("数据不存在，请刷新界面！"); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderEntity.java new file mode 100644 index 0000000..db98ca0 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderEntity.java @@ -0,0 +1,104 @@ +package jnpf.model.order; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产订单表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Data +@TableName("tpl_pro_order") +public class ProOrderEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "f_creator_time", fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "f_delete_user_id", fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "f_delete_time", fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField(value = "f_delete_mark", updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + + @TableField(value = "f_flow_id") + private String flowId; + + @TableField(value = "f_flow_task_id") + private String flowTaskId; + + @TableField("pro_no") + private String proNo; + + @TableField("pro_date") + private Date proDate; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("material_id") + private Integer materialId; + + @TableField("material_code") + private String materialCode; + + @TableField("material_name") + private String materialName; + + @TableField("spec") + private String spec; + + @TableField("unit") + private String unit; + + @TableField("plan_qty") + private BigDecimal planQty; + + @TableField("plan_bg_date") + private Date planBgDate; + + @TableField("plan_end_date") + private Date planEndDate; + + @TableField("process_flow") + private String processFlow; + + @TableField("plan_status") + private String planStatus; + + @TableField("plan_emp_id") + private String planEmpId; + + @TableField("plan_emp_name") + private String planEmpName; + + @TableField("complete_qty") + private BigDecimal completeQty; + + @TableField("is_all_line") + private String isAllLine; + + @TableField("store_in_qty") + private BigDecimal storeInQty; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderForm.java new file mode 100644 index 0000000..6ea9fbc --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderForm.java @@ -0,0 +1,86 @@ +package jnpf.model.order; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产订单 Form + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Data +@Schema(description = "ProOrderForm对象", name = "生产订单表单对象") +public class ProOrderForm implements Serializable { + + @Schema(description = "主键") + private Integer id; + + @Schema(description = "生产订单号(MO+年份+月份+3位流水号)") + private String proNo; + + @Schema(description = "生成日期") + private Date proDate; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "产品id") + private Integer materialId; + + @Schema(description = "产品编码") + private String materialCode; + + @Schema(description = "产品名称") + private String materialName; + + @Schema(description = "规格型号") + private String spec; + + @Schema(description = "单位") + private String unit; + + @Schema(description = "计划数量") + private BigDecimal planQty; + + @Schema(description = "计划开始日期") + private Date planBgDate; + + @Schema(description = "计划完成日期") + private Date planEndDate; + + @Schema(description = "工艺流程") + private String processFlow; + + @Schema(description = "订单状态（0 未下发 1已下发 2 执行中 3 已完成 4 暂停 5 关闭）") + private String planStatus; + + @Schema(description = "编制人id") + private String planEmpId; + + @Schema(description = "编制人名称") + private String planEmpName; + + @Schema(description = "完成数量") + private BigDecimal completeQty; + + @Schema(description = "是否所有产线(0 是 1否)") + private String isAllLine; + + @Schema(description = "入库数量") + private BigDecimal storeInQty; + + @Schema(description = "流程id") + private String flowId; + + @Schema(description = "流程任务主键") + private String flowTaskId; + + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderLineEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderLineEntity.java new file mode 100644 index 0000000..fec85fe --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderLineEntity.java @@ -0,0 +1,80 @@ +package jnpf.model.order; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 产线订单表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Data +@TableName("tpl_pro_order_line") +public class ProOrderLineEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "f_creator_time", fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "f_delete_user_id", fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "f_delete_time", fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField(value = "f_delete_mark", updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + + @TableField(value = "f_flow_id") + private String flowId; + + @TableField(value = "f_flow_task_id") + private String flowTaskId; + + @TableField("pro_no") + private String proNo; + + @TableField("pro_id") + private Integer proId; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("pro_bg_date") + private Date proBgDate; + + @TableField("pro_end_date") + private Date proEndDate; + + @TableField("line_cd") + private String lineCd; + + @TableField("line_name") + private String lineName; + + @TableField("line_id") + private Integer lineId; + + @TableField("complete_qty") + private BigDecimal completeQty; + + @TableField("plan_qty") + private BigDecimal planQty; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderMachineEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderMachineEntity.java new file mode 100644 index 0000000..73d665e --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderMachineEntity.java @@ -0,0 +1,85 @@ +package jnpf.model.order; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.util.Date; + +/** + * 机台执行订单表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Data +@TableName("tpl_pro_order_machine") +public class ProOrderMachineEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "f_creator_time", fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "f_delete_user_id", fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "f_delete_time", fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField(value = "f_delete_mark", updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + + @TableField(value = "f_flow_id") + private String flowId; + + @TableField(value = "f_flow_task_id") + private String flowTaskId; + + @TableField("pro_no") + private String proNo; + + @TableField("pro_id") + private Integer proId; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("pro_bg_date") + private Date proBgDate; + + @TableField("pro_end_date") + private Date proEndDate; + + @TableField("pro_status") + private String proStatus; + + @TableField("machine_cd") + private String machineCd; + + @TableField("machine_name") + private String machineName; + + @TableField("machine_id") + private Integer machineId; + + @TableField("line_cd") + private String lineCd; + + @TableField("line_name") + private String lineName; + + @TableField("line_id") + private Integer lineId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderPagination.java new file mode 100644 index 0000000..fa6a700 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderPagination.java @@ -0,0 +1,43 @@ +package jnpf.model.order; + +import io.swagger.v3.oas.annotations.media.Schema; +import jnpf.base.Pagination; +import lombok.Data; + +import java.util.Date; + +/** + * 生产订单分页查询对象 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Data +public class ProOrderPagination extends Pagination { + + @Schema(description = "生产订单号") + private String proNo; + + @Schema(description = "产品编码") + private String materialCode; + + @Schema(description = "产品名称") + private String materialName; + + @Schema(description = "订单状态") + private String planStatus; + + @Schema(description = "计划开始日期-开始") + private Date planBgDateStart; + + @Schema(description = "计划开始日期-结束") + private Date planBgDateEnd; + + @Schema(description = "计划完成日期-开始") + private Date planEndDateStart; + + @Schema(description = "计划完成日期-结束") + private Date planEndDateEnd; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderVO.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderVO.java new file mode 100644 index 0000000..301fec6 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProOrderVO.java @@ -0,0 +1,105 @@ +package jnpf.model.order; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产订单 VO + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Data +@Schema(description = "ProOrder对象", name = "生产订单") +public class ProOrderVO implements Serializable { + + @Schema(description = "主键") + private Integer id; + + @Schema(description = "创建人") + private String creatorUserId; + + @Schema(description = "创建时间") + private Date creatorTime; + + @Schema(description = "修改人") + private String lastModifyUserId; + + @Schema(description = "修改时间") + private Date lastModifyTime; + + @Schema(description = "删除或者禁用的用户") + private String deleteUserId; + + @Schema(description = "删除或者禁用的时间") + private Date deleteTime; + + @Schema(description = "删除标记，0表示已删除，1表示正常") + private Integer deleteMark; + + @Schema(description = "流程id") + private String flowId; + + @Schema(description = "流程任务主键") + private String flowTaskId; + + @Schema(description = "生产订单号(MO+年份+月份+3位流水号)") + private String proNo; + + @Schema(description = "生成日期") + private Date proDate; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "产品id") + private Integer materialId; + + @Schema(description = "产品编码") + private String materialCode; + + @Schema(description = "产品名称") + private String materialName; + + @Schema(description = "规格型号") + private String spec; + + @Schema(description = "单位") + private String unit; + + @Schema(description = "计划数量") + private BigDecimal planQty; + + @Schema(description = "计划开始日期") + private Date planBgDate; + + @Schema(description = "计划完成日期") + private Date planEndDate; + + @Schema(description = "工艺流程") + private String processFlow; + + @Schema(description = "订单状态（0 未下发 1已下发 2 执行中 3 已完成 4 暂停 5 关闭）") + private String planStatus; + + @Schema(description = "编制人id") + private String planEmpId; + + @Schema(description = "编制人名称") + private String planEmpName; + + @Schema(description = "完成数量") + private BigDecimal completeQty; + + @Schema(description = "是否所有产线(0 是 1否)") + private String isAllLine; + + @Schema(description = "入库数量") + private BigDecimal storeInQty; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProSoRelationEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProSoRelationEntity.java new file mode 100644 index 0000000..90a2e90 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ProSoRelationEntity.java @@ -0,0 +1,89 @@ +package jnpf.model.order; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 生产订单对应销售订单表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-04-17 + */ +@Data +@TableName("tpl_pro_so_relation") +public class ProSoRelationEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "f_creator_time", fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "f_delete_user_id", fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "f_delete_time", fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField(value = "f_delete_mark", updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + + @TableField(value = "f_flow_id") + private String flowId; + + @TableField(value = "f_flow_task_id") + private String flowTaskId; + + @TableField("pro_no") + private String proNo; + + @TableField("pro_id") + private Integer proId; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("sale_ord_id") + private Integer saleOrdId; + + @TableField("sale_ord_no") + private String saleOrdNo; + + @TableField("chang_pro_qty") + private BigDecimal changProQty; + + @TableField("cust_id") + private Integer custId; + + @TableField("cust_name") + private String custName; + + @TableField("material_name") + private String materialName; + + @TableField("spec") + private String spec; + + @TableField("unit") + private String unit; + + @TableField("material_id") + private Integer materialId; + + @TableField("material_code") + private String materialCode; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLinePagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLinePagination.java index cee42fd..e45029c 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLinePagination.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLinePagination.java @@ -15,7 +15,7 @@ import lombok.Data; @Data public class ProLinePagination extends Pagination { /** 查询key */ - private String[] selectKey; + private String selectKey; /** json */ private String json; /** 数据类型 0-当前页，1-全部数据 */ diff --git a/jnpf-java-boot/jnpf-web/src/router/modules/base.js b/jnpf-java-boot/jnpf-web/src/router/modules/base.js index fdb2d7c..b470441 100644 --- a/jnpf-java-boot/jnpf-web/src/router/modules/base.js +++ b/jnpf-java-boot/jnpf-web/src/router/modules/base.js @@ -87,6 +87,5 @@ const baseRouter = [{ icon: 'icon-ym icon-ym-btn-add', } }, - ] export default baseRouter \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/example/proline/select.vue b/jnpf-java-boot/jnpf-web/src/views/example/proline/select.vue new file mode 100644 index 0000000..9ba49ac --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/proline/select.vue @@ -0,0 +1,190 @@ + + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue index e677ee5..4b9e4aa 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/generate/index.vue @@ -17,7 +17,7 @@ - + @@ -156,20 +156,8 @@
- - - - - - + +