From 1f9350abc2748b6cba129b92d0fdbe030dc70f07 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Tue, 31 Dec 2024 11:43:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=B3=BB=E7=BB=9F=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E5=81=9A=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/mes/cal/controller/CalPlanController.java | 3 +++ .../ktg/mes/cal/controller/CalTeamController.java | 7 +++++++ .../java/com/ktg/mes/cal/mapper/CalPlanMapper.java | 2 ++ .../java/com/ktg/mes/cal/mapper/CalTeamMapper.java | 2 ++ .../com/ktg/mes/cal/service/ICalPlanService.java | 7 +++++++ .../com/ktg/mes/cal/service/ICalTeamService.java | 7 +++++++ .../mes/cal/service/impl/CalPlanServiceImpl.java | 13 +++++++++++++ .../mes/cal/service/impl/CalTeamServiceImpl.java | 13 +++++++++++++ .../mes/dv/controller/DvCheckPlanController.java | 6 ++++++ .../mes/dv/controller/DvMachineryController.java | 6 ++++++ .../com/ktg/mes/dv/mapper/DvMachineryMapper.java | 1 + .../com/ktg/mes/dv/service/IDvMachineryService.java | 6 ++++++ .../mes/dv/service/impl/DvCheckPlanServiceImpl.java | 2 +- .../mes/dv/service/impl/DvMachineryServiceImpl.java | 11 ++++++++++- .../ktg/mes/pro/controller/ProCardController.java | 6 ++++++ .../mes/pro/controller/ProWorkorderController.java | 3 +++ .../java/com/ktg/mes/pro/mapper/ProCardMapper.java | 2 ++ .../com/ktg/mes/pro/service/IProCardService.java | 7 +++++++ .../mes/pro/service/impl/ProCardServiceImpl.java | 13 +++++++++++++ .../src/main/resources/mapper/cal/CalPlanMapper.xml | 7 ++++++- .../src/main/resources/mapper/cal/CalTeamMapper.xml | 7 ++++++- .../main/resources/mapper/dv/DvMachineryMapper.xml | 5 +++++ .../src/main/resources/mapper/pro/ProCardMapper.xml | 5 +++++ 23 files changed, 137 insertions(+), 4 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalPlanController.java b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalPlanController.java index a9909ad..8925698 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalPlanController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalPlanController.java @@ -97,6 +97,9 @@ public class CalPlanController extends BaseController @PostMapping public AjaxResult add(@RequestBody CalPlan calPlan) { + if(UserConstants.NOT_UNIQUE.equals(calPlanService.checkPlanCodeUnique(calPlan))){ + return AjaxResult.error("编号已存在！"); + } int ret = calPlanService.insertCalPlan(calPlan); //根据选择的轮班方式生成默认的班次 calShiftService.addDefaultShift(calPlan.getPlanId(),calPlan.getShiftType()); diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java index edf6a15..d78c1b6 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java @@ -3,6 +3,7 @@ package com.ktg.mes.cal.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ktg.common.constant.UserConstants; import com.ktg.mes.cal.service.ICalTeamMemberService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -92,6 +93,9 @@ public class CalTeamController extends BaseController @PostMapping public AjaxResult add(@RequestBody CalTeam calTeam) { + if(UserConstants.NOT_UNIQUE.equals(calTeamService.checkTeamCodeUnique(calTeam))){ + return AjaxResult.error("编号已存在！"); + } return toAjax(calTeamService.insertCalTeam(calTeam)); } @@ -103,6 +107,9 @@ public class CalTeamController extends BaseController @PutMapping public AjaxResult edit(@RequestBody CalTeam calTeam) { + if(UserConstants.NOT_UNIQUE.equals(calTeamService.checkTeamCodeUnique(calTeam))){ + return AjaxResult.error("编号已存在！"); + } return toAjax(calTeamService.updateCalTeam(calTeam)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalPlanMapper.java b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalPlanMapper.java index 958a266..a29edd8 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalPlanMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalPlanMapper.java @@ -62,4 +62,6 @@ public interface CalPlanMapper * @return 结果 */ public int deleteCalPlanByPlanIds(Long[] planIds); + + CalPlan checkPlanCodeUnique(CalPlan calPlan); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMapper.java b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMapper.java index 61463b3..6164a27 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMapper.java @@ -58,4 +58,6 @@ public interface CalTeamMapper * @return 结果 */ public int deleteCalTeamByTeamIds(Long[] teamIds); + + CalTeam checkTeamCodeUnique(CalTeam calTeam); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalPlanService.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalPlanService.java index 11539f6..acfca5d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalPlanService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalPlanService.java @@ -58,4 +58,11 @@ public interface ICalPlanService * @return 结果 */ public int deleteCalPlanByPlanId(Long planId); + + /** + * 校验编码是否唯一 + * @param calPlan + * @return + */ + String checkPlanCodeUnique(CalPlan calPlan); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamService.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamService.java index 82d2ca3..29cae8b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamService.java @@ -58,4 +58,11 @@ public interface ICalTeamService * @return 结果 */ public int deleteCalTeamByTeamId(Long teamId); + + /** + * 校验编码是否唯一 + * @param calTeam + * @return + */ + String checkTeamCodeUnique(CalTeam calTeam); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalPlanServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalPlanServiceImpl.java index 947ec4d..37de99b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalPlanServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalPlanServiceImpl.java @@ -1,7 +1,10 @@ package com.ktg.mes.cal.service.impl; import java.util.List; + +import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.cal.mapper.CalPlanMapper; @@ -93,4 +96,14 @@ public class CalPlanServiceImpl implements ICalPlanService { return calPlanMapper.deleteCalPlanByPlanId(planId); } + + @Override + public String checkPlanCodeUnique(CalPlan calPlan) { + CalPlan plan = calPlanMapper.checkPlanCodeUnique(calPlan); + Long planId = calPlan.getPlanId() == null ? -1L : calPlan.getPlanId(); + if (StringUtils.isNotNull(plan) && plan.getPlanId().longValue() != planId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java index bae266e..eb10b2c 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamServiceImpl.java @@ -1,7 +1,10 @@ package com.ktg.mes.cal.service.impl; import java.util.List; + +import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.cal.mapper.CalTeamMapper; @@ -93,4 +96,14 @@ public class CalTeamServiceImpl implements ICalTeamService { return calTeamMapper.deleteCalTeamByTeamId(teamId); } + + @Override + public String checkTeamCodeUnique(CalTeam calTeam) { + CalTeam team = calTeamMapper.checkTeamCodeUnique(calTeam); + Long teamId = calTeam.getTeamId() == null ? -1L : calTeam.getTeamId(); + if (StringUtils.isNotNull(team) && team.getTeamId().longValue() != teamId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java index 84743ae..04e957d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java @@ -91,6 +91,9 @@ public class DvCheckPlanController extends BaseController @PostMapping public AjaxResult add(@RequestBody DvCheckPlan dvCheckPlan) { + if(UserConstants.NOT_UNIQUE.equals(dvCheckPlanService.checkPlanCodeUnique(dvCheckPlan))){ + return AjaxResult.error("编号已存在！"); + } return toAjax(dvCheckPlanService.insertDvCheckPlan(dvCheckPlan)); } @@ -102,6 +105,9 @@ public class DvCheckPlanController extends BaseController @PutMapping public AjaxResult edit(@RequestBody DvCheckPlan dvCheckPlan) { + if(UserConstants.NOT_UNIQUE.equals(dvCheckPlanService.checkPlanCodeUnique(dvCheckPlan))){ + return AjaxResult.error("编号已存在！"); + } if(UserConstants.ORDER_STATUS_FINISHED.equals(dvCheckPlan.getStatus())){ DvCheckMachinery para1 = new DvCheckMachinery(); para1.setPlanId(dvCheckPlan.getPlanId()); diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java index 9e10b6b..a1d00bf 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvMachineryController.java @@ -78,6 +78,9 @@ public class DvMachineryController extends BaseController @PostMapping public AjaxResult add(@RequestBody DvMachinery dvMachinery) { + if(UserConstants.NOT_UNIQUE.equals(dvMachineryService.checkRecptCodeUnique(dvMachinery))){ + return AjaxResult.error("编号已存在！"); + } return dvMachineryService.insertDvMachinery(dvMachinery); } @@ -89,6 +92,9 @@ public class DvMachineryController extends BaseController @PutMapping public AjaxResult edit(@RequestBody DvMachinery dvMachinery) { + if(UserConstants.NOT_UNIQUE.equals(dvMachineryService.checkRecptCodeUnique(dvMachinery))){ + return AjaxResult.error("编号已存在！"); + } return dvMachineryService.updateDvMachinery(dvMachinery); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvMachineryMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvMachineryMapper.java index c02a15e..0fc3c30 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvMachineryMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvMachineryMapper.java @@ -68,4 +68,5 @@ public interface DvMachineryMapper */ public int deleteDvMachineryByMachineryIds(Long[] machineryIds); + DvMachinery checkRecptCodeUnique(DvMachinery dvMachinery); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvMachineryService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvMachineryService.java index a091621..8da883c 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvMachineryService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvMachineryService.java @@ -71,4 +71,10 @@ public interface IDvMachineryService */ public String importMachinery(List machineryList, Boolean isUpdateSupport, String operName); + /** + * 查询编码是否唯一 + * @param dvMachinery + * @return + */ + String checkRecptCodeUnique(DvMachinery dvMachinery); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java index 6d376a4..c75988d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java @@ -51,7 +51,7 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService public String checkPlanCodeUnique(DvCheckPlan dvCheckPlan) { DvCheckPlan plan = dvCheckPlanMapper.checkPlanCodeUnique(dvCheckPlan); Long planId = dvCheckPlan.getPlanId()==null?-1L:dvCheckPlan.getPlanId(); - if(StringUtils.isNotNull(plan) && plan.getPlanId().longValue()==planId.longValue()){ + if(StringUtils.isNotNull(plan) && plan.getPlanId().longValue()!=planId.longValue()){ return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java index 06122c2..68c579f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvMachineryServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil; import com.ktg.common.constant.UserConstants; import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import com.ktg.mes.dv.domain.DvMachinery; import com.ktg.mes.dv.mapper.DvMachineryMapper; import com.ktg.mes.dv.service.IDvMachineryService; @@ -165,5 +166,13 @@ public class DvMachineryServiceImpl implements IDvMachineryService return String.format("操作用户：%s，导入完成，成功 %d 条，失败 %d 条。", operName, successCount, failureCount); } - + @Override + public String checkRecptCodeUnique(DvMachinery dvMachinery) { + DvMachinery machinery = dvMachineryMapper.checkRecptCodeUnique(dvMachinery); + Long machineryId = dvMachinery.getMachineryId() == null ? -1L : dvMachinery.getMachineryId(); + if (StringUtils.isNotNull(machinery) && machinery.getMachineryId().longValue() != machineryId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java index 54a2450..78054a5 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java @@ -87,6 +87,9 @@ public class ProCardController extends BaseController @PostMapping public AjaxResult add(@RequestBody ProCard proCard) { + if(UserConstants.NOT_UNIQUE.equals(proCardService.checkCardCodeUnique(proCard))){ + return AjaxResult.error("编号已存在！"); + } int ret = proCardService.insertProCard(proCard); wmBarCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_PROCARD,proCard.getCardId(),proCard.getCardCode(),""); return toAjax(ret); @@ -100,6 +103,9 @@ public class ProCardController extends BaseController @PutMapping public AjaxResult edit(@RequestBody ProCard proCard) { + if(UserConstants.NOT_UNIQUE.equals(proCardService.checkCardCodeUnique(proCard))){ + return AjaxResult.error("编号已存在！"); + } return toAjax(proCardService.updateProCard(proCard)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java index ee94e0e..30e5703 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java @@ -132,6 +132,9 @@ public class ProWorkorderController extends BaseController @PutMapping public AjaxResult edit(@RequestBody ProWorkorder proWorkorder) { + if(UserConstants.NOT_UNIQUE.equals(proWorkorderService.checkWorkorderCodeUnique(proWorkorder))){ + return AjaxResult.error("生产工单编号已存在！"); + } ProWorkorder workorder = proWorkorderService.selectProWorkorderByWorkorderId(proWorkorder.getWorkorderId()); int ret =proWorkorderService.updateProWorkorder(proWorkorder); //如果是产品和数量发生变化则需要重新生成BOM组成 diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProCardMapper.java b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProCardMapper.java index 815ebd1..5f948c7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProCardMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProCardMapper.java @@ -61,4 +61,6 @@ public interface ProCardMapper * @return 结果 */ public int deleteProCardByCardIds(Long[] cardIds); + + ProCard checkCardCodeUnique(ProCard proCard); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProCardService.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProCardService.java index b5f144b..44e61be 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProCardService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProCardService.java @@ -65,4 +65,11 @@ public interface IProCardService * @return 结果 */ public int deleteProCardByCardId(Long cardId); + + /** + * 校验编码是否唯一 + * @param proCard + * @return + */ + String checkCardCodeUnique(ProCard proCard); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProCardServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProCardServiceImpl.java index 8cfdaa7..c042e2a 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProCardServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProCardServiceImpl.java @@ -1,7 +1,10 @@ package com.ktg.mes.pro.service.impl; import java.util.List; + +import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.pro.mapper.ProCardMapper; @@ -103,4 +106,14 @@ public class ProCardServiceImpl implements IProCardService { return proCardMapper.deleteProCardByCardId(cardId); } + + @Override + public String checkCardCodeUnique(ProCard proCard) { + ProCard card = proCardMapper.checkCardCodeUnique(proCard); + Long cardId = proCard.getCardId() == null ? -1L : proCard.getCardId(); + if (StringUtils.isNotNull(card) && card.getCardId().longValue() != cardId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } } diff --git a/ktg-mes/src/main/resources/mapper/cal/CalPlanMapper.xml b/ktg-mes/src/main/resources/mapper/cal/CalPlanMapper.xml index d3bf2ca..3082906 100644 --- a/ktg-mes/src/main/resources/mapper/cal/CalPlanMapper.xml +++ b/ktg-mes/src/main/resources/mapper/cal/CalPlanMapper.xml @@ -50,7 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where plan_id = #{planId} - + + insert into cal_plan diff --git a/ktg-mes/src/main/resources/mapper/cal/CalTeamMapper.xml b/ktg-mes/src/main/resources/mapper/cal/CalTeamMapper.xml index c7802bc..5a2cce0 100644 --- a/ktg-mes/src/main/resources/mapper/cal/CalTeamMapper.xml +++ b/ktg-mes/src/main/resources/mapper/cal/CalTeamMapper.xml @@ -37,7 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where team_id = #{teamId} - + + insert into cal_team diff --git a/ktg-mes/src/main/resources/mapper/dv/DvMachineryMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvMachineryMapper.xml index e31f10a..23babae 100644 --- a/ktg-mes/src/main/resources/mapper/dv/DvMachineryMapper.xml +++ b/ktg-mes/src/main/resources/mapper/dv/DvMachineryMapper.xml @@ -60,6 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where machinery_code= #{machineryCode} + insert into dv_machinery diff --git a/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml index 61692d5..93ca620 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml @@ -74,6 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pcp.workstation_id = #{workstationId} order by pcp.input_time desc +