Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IBaseMesService.java

@@ -40,6 +40,9 @@ public interface IBaseMesService<T extends BaseBean> {
     @ApiOperation(value = "批量新增数据", notes = "批量新增数据")
     List<T> insertBatch(List<T> bean);
 
+    @ApiOperation(value = "校验导入数据", notes = "校验导入数据")
+    void validateImport(List<T> bean);
+
     @ApiOperation(value = "修改信息", notes = "修改信息")
     T update(T bean);
 

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectTypeService.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesDefectType;
+import cn.estsh.i3plus.pojo.mes.bean.MesDefectWarnConfig;
 
 /**
  * @Description:
@@ -9,5 +10,4 @@ import cn.estsh.i3plus.pojo.mes.bean.MesDefectType;
  */
 public interface IMesDefectTypeService extends IBaseMesService<MesDefectType> {
 
-
 }

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesDefectWarnConfigService.java

@@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesDefectWarnConfig;
  * @CreateDate 2024/04/16
  * @Author mingliang.li
  */
-public interface IMesDefectAlarmConfigService extends IBaseMesService<MesDefectWarnConfig> {
+public interface IMesDefectWarnConfigService extends IBaseMesService<MesDefectWarnConfig> {
 
 
     public void saveDefectAlarmConfigByJob(String org);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java

@@ -418,7 +418,7 @@ public abstract class BaseMesController<T extends BaseBean> extends BaseControll
             List<T> beanList = excelTool.importData(file.getOriginalFilename(), file.getInputStream(), mesClass);
 
             // 校验导入数据
-            validateImport(beanList);
+            baseService.validateImport(beanList);
             String userName = AuthUtil.getSessionUser().getUserName();
             String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
             // 导入数据初始化

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderPartController.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.busi;
+
+import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController;
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api("点检单明细物料")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesSpotCheckOrderPart")
+public class MesSpotCheckOrderPartController extends BaseMesController<MesSpotCheckOrderPart> {
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.apiservice.schedulejob;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesDefectAlarmConfigService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesDefectWarnConfigService;
 import cn.estsh.i3plus.mes.apiservice.schedulejob.BaseMesScheduleJob;
 import cn.estsh.impp.framework.boot.init.ApplicationProperties;
 import com.alibaba.fastjson.JSONObject;
@@ -35,7 +35,7 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob {
     private static final long serialVersionUID = 9072058154235836696L;
 
     @Autowired
-    private IMesDefectAlarmConfigService defectAlarmConfigService;
+    private IMesDefectWarnConfigService defectWarnConfigService;
 
     @Value("${server.port}")
     private String serverPort;
@@ -75,7 +75,7 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob {
 
             for (String organizeCode : organizeCodeList) {
 
-                defectAlarmConfigService.saveDefectAlarmConfigByJob(organizeCode);
+                defectWarnConfigService.saveDefectAlarmConfigByJob(organizeCode);
             }
             LOGGER.info("缺陷告警配置job结束 ----- end");
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java

@@ -12,8 +12,10 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.lang.reflect.ParameterizedType;
@@ -154,6 +156,12 @@ public abstract class BaseMesService<T extends BaseBean> implements IBaseMesServ
                 new Object[]{status, userName, TimeTool.getNowTime(true)});
     }
 
+    @Override
+    public void validateImport(List<T> beanList) {
+        /* 新增数据校验 */
+        ValidatorBean.beginValid(beanList);
+    }
+
     protected void onInsertBean(T item) {
     }
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java

@@ -7,12 +7,15 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerOriganze;
 import cn.estsh.i3plus.pojo.mes.repository.MesCustomerCarModelRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesCustomerRepository;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author yinxiao
  * @date 2023-2023/6/2 10:54
@@ -24,6 +27,8 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
 
     @Autowired
     private MesCustomerCarModelRepository mesCustomerCarModelRDao;
+    @Autowired
+    private MesCustomerRepository customerRepository;
 
     protected void onInsertBean(MesCustomerOriganze item) {
         // 数据校验
@@ -76,7 +81,7 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
         //校验客户车型配置
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomerOriganze.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesCustomerOriganze.getCustOrganizeCode(), "customerOrganizeCode", packBean);
-        if(mesCustomerCarModelRDao.isExitByHql(packBean)){
+        if (mesCustomerCarModelRDao.isExitByHql(packBean)) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
@@ -84,4 +89,23 @@ public class MesCustomerOriganzeService extends BaseMesService<MesCustomerOrigan
                     .build();
         }
     }
+
+    // 校验导入数据
+    @Override
+    public void validateImport(List<MesCustomerOriganze> beanList) {
+
+        for (MesCustomerOriganze bean : beanList) {
+
+            //todo
+            //查询数据库校验字段，待确定
+//            DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+//            DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean);
+//            MesCustomer customer = customerRepository.getByProperty(packBean);
+//            if (StringUtils.isEmpty(customer)) {
+//                throw new ImppBusiException(String.format("客户代码【%s】不存在", bean.getCustCode()));
+//            }
+//
+//            bean.setCustName(customer.getCustName());
+        }
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService;
-import cn.estsh.i3plus.ext.mes.api.base.IMesDefectAlarmConfigService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesDefectWarnConfigService;
 import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesDefectRecordDao;
 import cn.estsh.i3plus.ext.mes.pojo.model.MesDefectRecordModel;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
@@ -24,7 +24,7 @@ import java.util.List;
 
 @Service
 @Slf4j
-public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConfig> implements IMesDefectAlarmConfigService {
+public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConfig> implements IMesDefectWarnConfigService {
 
 
     @Autowired

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinCfgService.java

@@ -74,4 +74,9 @@ public class MesWorkCellBinCfgService extends BaseMesService<MesWorkCellBinCfg>
         }
     }
 
+    protected void setPackQueryBean(MesWorkCellBinCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getBinCode(), "binCode", packBean);
+    }
+
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderPartService.java

@@ -6,7 +6,10 @@ import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @Slf4j
 public class MesSpotCheckOrderPartService extends BaseMesService<MesSpotCheckOrderPart> implements IMesSpotCheckOrderPartService {
+
 }