Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz

# Conflicts:
#	console/src/main/resources/i18n/messages.properties

console/src/main/resources/i18n/messages.properties

@@ -1,9 +1,21 @@
 common.export.noTemplate.error = 当前主数据模板字段未维护
 MaterData.import.Summary = 导入完成：->总共导入数据:{0}, 成功:{1}, 失败:{2}
-MaterData.import.upDateObjectNotExist = 更新的对象不存在
 MaterData.import.createfail.resource = 资源创建失败: - > 行项: {0}, 位置: {1}, 错误信息: {2}
 MaterData.import.updatefail.resource = 资源更新失败: - > 行项: {0}, 位置: {1}, 错误信息: {2}
 MaterData.import.createfail.operation = 工序创建失败: - > 行项: {0}, 位置: {1}, 错误信息: {2}
 MaterData.import.updatefail.operation = 工序创建失败: - > 行项: {0}, 位置: {1}, 错误信息: {2}
 MaterData.import.insertfail.workcenter = 工作中心创建失败: - > 行项: {0}, 位置: {1}, 错误信息: {2}
-MaterData.import.updatefail.workcenter = 工作中心创建失败: - > 行项: {0}, 位置: {1}, 错误信息: {2}
+MaterData.import.updatefail.workcenter = 工作中心创建失败: - > 行项: {0}, 位置: {1}, 错误信息: {2}
+
+
+#---------------------公用模块 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}]

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")
+    @GetMapping("/SelectWorkCenter")
     public R getWorkCenterWcList(FrontPage frontPage){
         List<WorkCenter> result;
         String workCenter=frontPage.getGlobalQuery();
-        result = workCenterService.workCenterlist(workCenter);
-        return R.ok(result);
+        return R.ok(workCenterService.workCenterlist(frontPage.getPagePlus(),workCenter));
     }
 }

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;
-
 /**
  * <p>
  *  Mapper 接口
@@ -17,5 +16,5 @@ import java.util.List;
  */
 @Repository
 public interface WorkCenterMapper extends BaseMapper<WorkCenter> {
-    List<WorkCenter> workCenterlist(@Param("site") String site,@Param("workCenter") String workCenter);
+    IPage workCenterlist(IPage page, @Param("site") String site, @Param("workCenter") String workCenter);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java

@@ -26,5 +26,5 @@ public interface WorkCenterService extends IService<WorkCenter> {
 
     List<WorkCenter> selectList(WorkCenter workCenter);
 
-    List<WorkCenter> workCenterlist(String workCenter);
+    IPage workCenterlist(IPage page,String workCenter);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java

@@ -44,8 +44,8 @@ public class WorkCenterServiceImpl extends ServiceImpl<WorkCenterMapper, WorkCen
     }
 
     @Override
-    public List<WorkCenter> 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);
     }
 }

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
           <if test="workCenter != null and workCenter != ''">
-              (A.WORK_CENTER like '%${workCenter}' OR
-              B.DESCRIPTION like '%${workCenter}') AND
+              (A.WORK_CENTER like '%${workCenter}%' OR
+              B.DESCRIPTION like '%${workCenter}%') AND
           </if>
            A.SITE = #{site}
     </select>