From 274798eff74d6576f57c242e81b7d4da20d67f4f Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Wed, 24 Jan 2024 15:34:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=96=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=BC=96=E5=86=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 1 - .../controller/MesReportWorksController.java | 33 +++++++ .../MesUnitPriceReportController.java | 10 ++ .../java/com/op/mes/domain/MesReportWork.java | 9 ++ .../op/mes/mapper/MesReportWorksMapper.java | 15 +++ .../com/op/mes/mapper/MesUnitPriceMapper.java | 2 + .../mes/service/IMesReportWorksService.java | 11 +++ .../impl/MesReportWorksServiceImpl.java | 24 +++++ .../service/impl/MesUnitPriceServiceImpl.java | 58 +++++++++-- .../main/resources/mapper/mes/MesRWMapper.xml | 97 +++++++++++++++++++ .../mapper/mes/MesReportWorkMapper.xml | 6 ++ .../mapper/mes/MesUnitPriceMapper.xml | 4 + .../op-open/src/main/resources/bootstrap.yml | 12 +-- .../sap/service/impl/SapOrderServiceImpl.java | 8 -- .../src/main/resources/bootstrap.yml | 12 +-- .../wms/controller/BaseProductController.java | 9 ++ .../com/op/wms/mapper/BaseProductMapper.java | 16 +-- .../op/wms/service/IBaseProductService.java | 16 +-- .../service/impl/BaseProductServiceImpl.java | 20 ++-- .../mapper/wms/BaseProductMapper.xml | 78 ++++++++++++++- 20 files changed, 386 insertions(+), 55 deletions(-) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorksMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/MesRWMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index f64f5b14..7d218a9d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -70,7 +70,6 @@ public class MesReportWorkController extends BaseController { List hzlist = mesReportWorkService.getReportWorkHzList(mesReportWork); return getDataTable(hzlist); } - /** * 导出报工报表列表 */ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java new file mode 100644 index 00000000..a015bce3 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java @@ -0,0 +1,33 @@ +package com.op.mes.controller; + +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.page.TableDataInfo; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.mes.domain.MesReportWork; +import com.op.mes.service.IMesReportWorksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static com.op.common.core.utils.PageUtils.startPage; + +@RestController +@RequestMapping("/reportWorks") +public class MesReportWorksController extends BaseController { + @Autowired + private IMesReportWorksService mesReportWorksService; + + /** + * 产线报工 + */ + @RequiresPermissions("mes:reportWork:lists") + @GetMapping("/lists") + public TableDataInfo lists(MesReportWork mesReportWork) { + startPage(); + List hzlist = mesReportWorksService.getReportWorksList(mesReportWork); + return getDataTable(hzlist); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java new file mode 100644 index 00000000..6ebc7877 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java @@ -0,0 +1,10 @@ +package com.op.mes.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/unitPriceReport") +public class MesUnitPriceReportController { + +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index 010e2284..bc45ed0d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -220,6 +220,15 @@ public class MesReportWork extends BaseEntity { private Long workTimes; private String workCenter; private String shiftId; + private String keywords; + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } private List consumesInfos; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorksMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorksMapper.java new file mode 100644 index 00000000..0ce62aec --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorksMapper.java @@ -0,0 +1,15 @@ +package com.op.mes.mapper; + + +import com.op.mes.domain.MesReportWork; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface MesReportWorksMapper { + + List getReportWorkList(MesReportWork mesReportWork); + + +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java index 1d08ed5f..5fac5954 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java @@ -21,6 +21,8 @@ public interface MesUnitPriceMapper { */ public MesUnitPrice selectMesUnitPriceByPicId(String picId); + public MesUnitPrice selectMesUnitPriceByProCode(MesUnitPrice mesUnitPrice); + /** * 查询unitPrice列表 * diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java new file mode 100644 index 00000000..bf009551 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java @@ -0,0 +1,11 @@ +package com.op.mes.service; + +import com.op.mes.domain.MesReportWork; + +import java.util.List; + +public interface IMesReportWorksService { + + List getReportWorksList(MesReportWork mesReportWork); + +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java new file mode 100644 index 00000000..404e34c1 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java @@ -0,0 +1,24 @@ +package com.op.mes.service.impl; + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.mes.domain.MesReportWork; +import com.op.mes.mapper.MesReportWorksMapper; +import com.op.mes.service.IMesReportWorksService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MesReportWorksServiceImpl implements IMesReportWorksService { + + @Autowired + private MesReportWorksMapper mesReportWorksMapper; + + @Override + @DS("#header.poolName") + public List getReportWorksList(MesReportWork mesReportWork) { + return mesReportWorksMapper.getReportWorkList(mesReportWork); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java index 4aa6c5e5..90cdea91 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.exception.ServiceException; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; +import com.op.common.core.utils.bean.BeanValidators; import com.op.common.core.utils.uuid.IdUtils; import com.op.mes.domain.MesUnitPrice; import com.op.mes.mapper.MesUnitPriceMapper; @@ -15,6 +16,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.Validator; + /** * unitPriceService业务层处理 @@ -30,6 +33,9 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { @Autowired private MesUnitPriceMapper mesUnitPriceMapper; + @Autowired + protected Validator validator; + /** * 查询unitPrice @@ -106,7 +112,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { @DS("#header.poolName") public String importMesUnitPrice(List UnitPriceList, Boolean updateSupport, String operName) { if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) { - throw new ServiceException("导入数据不能为空！"); + throw new ServiceException("导入用户数据不能为空！"); } int successNum = 0; int failureNum = 0; @@ -114,15 +120,22 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { StringBuilder failureMsg = new StringBuilder(); for (MesUnitPrice mesUnitPrice : UnitPriceList) { try { - // 验证是否存在这个产线产品 - mesUnitPrice.setPicId(IdUtils.simpleUUID()); - mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); - successNum++; - successMsg.append("导入成功"); - + // 验证是否存在这个产品的单价信息 + MesUnitPrice u=mesUnitPriceMapper.selectMesUnitPriceByProCode(mesUnitPrice); + if (StringUtils.isNull(u)) { + BeanValidators.validateWithException(validator, mesUnitPrice); + mesUnitPrice.setPicId(IdUtils.simpleUUID()); + mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); + successNum++; + successMsg.append("
" + successNum + mesUnitPrice.getProductName()+"-"+mesUnitPrice.getChildprocessName() + " 导入成功"); + } + else { + failureNum++; + failureMsg.append("
" + failureNum + "、产品 " + mesUnitPrice.getProductName() + " 已存在"); + } } catch (Exception e) { failureNum++; - String msg = "导入失败："; + String msg = "
" + failureNum + "、产品 " + mesUnitPrice.getProductName() + " 导入失败："; failureMsg.append(msg + e.getMessage()); log.error(msg, e); } @@ -134,5 +147,34 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService { successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); } return successMsg.toString(); +// if (StringUtils.isNull(UnitPriceList) || UnitPriceList.size() == 0) { +// throw new ServiceException("导入数据不能为空！"); +// } +// int successNum = 0; +// int failureNum = 0; +// StringBuilder successMsg = new StringBuilder(); +// StringBuilder failureMsg = new StringBuilder(); +// for (MesUnitPrice mesUnitPrice : UnitPriceList) { +// try { +// // 验证是否存在这个产线产品 +// mesUnitPrice.setPicId(IdUtils.simpleUUID()); +// mesUnitPriceMapper.insertMesUnitPrice(mesUnitPrice); +// successNum++; +// successMsg.append("导入成功"); +// +// } catch (Exception e) { +// failureNum++; +// String msg = "导入失败："; +// failureMsg.append(msg + e.getMessage()); +// log.error(msg, e); +// } +// } +// if (failureNum > 0) { +// failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); +// throw new ServiceException(failureMsg.toString()); +// } else { +// successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); +// } +// return successMsg.toString(); } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesRWMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesRWMapper.xml new file mode 100644 index 00000000..1ad46c2d --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesRWMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 716138c8..6dfeb4ef 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -500,6 +500,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" unit from mes_report_work where del_flag = '0' and parent_order = '0' + and workorder_code like concat('%', #{workorderCode}, '%') and workorder_code like concat('%', #{workorderCode}, '%') and product_code like concat('%', #{productCode}, '%') and product_name like concat('%', #{productName}, '%') @@ -513,6 +514,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join pro_order_workorder pow on mrw.workorderCode = pow.workorder_code pow.del_flag = '0' + + and pow.order_code like concat('%', #{keywords}, '%') or + pow.workorder_code_sap like concat('%', #{keywords}, '%') or + mrw.productCode like concat('%', #{keywords}, '%') + and pow.product_date >= #{feedbackTimeStart} and #{feedbackTimeEnd} >= pow.product_date and pow.order_code like concat('%', #{orderCode}, '%') diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml index c79b86c5..f085ac3e 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml @@ -52,6 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where pic_id = #{picId} + insert into mes_unit_price diff --git a/op-modules/op-open/src/main/resources/bootstrap.yml b/op-modules/op-open/src/main/resources/bootstrap.yml index f032dd8b..b9dd2cae 100644 --- a/op-modules/op-open/src/main/resources/bootstrap.yml +++ b/op-modules/op-open/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test #命名空间 #group: local # 配置中心地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 8f04090a..8fbf248b 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -187,13 +187,7 @@ public class SapOrderServiceImpl implements SapOrderService { JCoParameterList J= func.getExportParameterList(); System.out.println(func.getExportParameterList()); L_MSG= func.getExportParameterList().getString("L_MSG"); - // String RETCODE = func.getExportParameterList().getString("RETCODE"); - //String LV_ORDER_NUMBER= func.getExportParameterList().getString("LV_ORDER_NUMBER"); -// if (RETCODE.equals(Constants.FAIL)){ -// return R.fail(LV_ORDER_NUM_List,L_MSG); -// } JCoTable LT_ZGD=func.getTableParameterList().getTable("LT_ZGD"); - for (int i = 0; i - + @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + + + insert into base_product @@ -351,5 +353,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where product_code = #{productCode} and del_flag ='0' + - \ No newline at end of file +