From 19fb5cd76f82af2489801a4518795349ec17357e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Thu, 6 May 2021 13:47:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E6=97=B6=E6=AE=B5=20=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E5=BF=83=E5=88=86=E9=A1=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E5=92=8C=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/meapi/controller/WorkCenterController.java | 8 ++++++-- .../foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java | 5 ++--- .../mesnac/meapi/service/WorkCenterService.java | 2 +- .../mesnac/meapi/service/impl/WorkCenterServiceImpl.java | 4 ++-- meapi/src/main/resources/mapper/WorkCenterMapper.xml | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java index d480c35f..91b6271b 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java @@ -127,12 +127,16 @@ public class WorkCenterController { return R.ok(workCenterService.removeByIds(ids)); } + /** + * 查询工作中心和工作中心描述 + * @param frontPage + * @return + */ @ResponseBody @GetMapping("/selectWorkCenter") public R getWorkCenterWcList(FrontPage frontPage){ List result; String workCenter=frontPage.getGlobalQuery(); - result = workCenterService.workCenterlist(workCenter); - return R.ok(result); + return R.ok(workCenterService.workCenterlist(frontPage.getPagePlus(),workCenter)); } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java index 1cd24c7f..3458d210 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java @@ -1,12 +1,11 @@ package com.foreverwin.mesnac.meapi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.meapi.model.WorkCenter; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - /** *

* Mapper 接口 @@ -17,5 +16,5 @@ import java.util.List; */ @Repository public interface WorkCenterMapper extends BaseMapper { - List workCenterlist(@Param("site") String site,@Param("workCenter") String workCenter); + IPage workCenterlist(IPage page, @Param("site") String site, @Param("workCenter") String workCenter); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java index 63511881..9571219a 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java @@ -26,5 +26,5 @@ public interface WorkCenterService extends IService { List selectList(WorkCenter workCenter); - List workCenterlist(String workCenter); + IPage workCenterlist(IPage page,String workCenter); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java index 90a23c74..107ef17a 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java @@ -44,8 +44,8 @@ public class WorkCenterServiceImpl extends ServiceImpl workCenterlist(String workCenter) { + public IPage workCenterlist(IPage page,String workCenter) { String site = CommonMethods.getSite(); - return workCenterMapper.workCenterlist(site, workCenter); + return workCenterMapper.workCenterlist(page,site, workCenter); } } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/WorkCenterMapper.xml b/meapi/src/main/resources/mapper/WorkCenterMapper.xml index 87b09ded..3ee6311e 100644 --- a/meapi/src/main/resources/mapper/WorkCenterMapper.xml +++ b/meapi/src/main/resources/mapper/WorkCenterMapper.xml @@ -52,8 +52,8 @@ LEFT JOIN WORK_CENTER_T B ON A.HANDLE=B.WORK_CENTER_BO WHERE - (A.WORK_CENTER like '%${workCenter}' OR - B.DESCRIPTION like '%${workCenter}') AND + (A.WORK_CENTER like '%${workCenter}%' OR + B.DESCRIPTION like '%${workCenter}%') AND A.SITE = #{site} From a13b5fb991c29300f3f0ede2b564c726f3d15433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Thu, 6 May 2021 14:01:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E6=97=B6=E6=AE=B5=20=20url=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/meapi/controller/WorkCenterController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java index 91b6271b..442824fa 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java @@ -133,7 +133,7 @@ public class WorkCenterController { * @return */ @ResponseBody - @GetMapping("/selectWorkCenter") + @GetMapping("/SelectWorkCenter") public R getWorkCenterWcList(FrontPage frontPage){ List result; String workCenter=frontPage.getGlobalQuery(); From 371c7bac3dc6cdd619758184e0678e3ccbf287b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Thu, 6 May 2021 14:22:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/i18n/messages.properties | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/console/src/main/resources/i18n/messages.properties b/console/src/main/resources/i18n/messages.properties index 436c7e98..e75b0c90 100644 --- a/console/src/main/resources/i18n/messages.properties +++ b/console/src/main/resources/i18n/messages.properties @@ -6,4 +6,17 @@ MaterData.import.updatefail.resource = 更新资源数据失败 MaterData.import.createfail.operation = 创建工序数据失败 MaterData.import.updatefail.operation = 更新工序数据失败 MaterData.import.insertfail.workcenter = 新增工作中心失败 -MaterData.import.updatefail.workcenter = 更新工作中心失败 \ No newline at end of file +MaterData.import.updatefail.workcenter = 更新工作中心失败 + + +#---------------------公用模块 common.功能名称.信息描述------------------------------------------------ +common.nextNumber.qty.error=获取下一编号数量不能为小于1的整数 +common.nextNumber.type.error=未找到类型[{0}]的编码规则，请先维护 +common.nextNumber.maxLimited.error=编号类型[{0}]序号已达上限，不可使用 +common.nextNumber.save.success=编码规则保存成功 +common.nextNumber.save.failue=编码规则保存失败 +common.nextNumber.repeat.error=请检查第{0}行编码规则【类型】、【前缀】是否重复 +common.nextNumber.startSeq.error=请检查第{0}行默认开始序列，不能小于1 +common.nextNumber.check.error=请检查第{0}行编码规则【类型】、【序列长度】、【前缀】是否填写 +common.nextNumber.item.customField.error=未找到物料[{0}]的自定义字段[{1}]匹配上的编码规则 +common.nextNumber.item.error=没有找到站点[{0}]下的物料编码[{1}] \ No newline at end of file