Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg;
 
 /**
@@ -10,4 +12,5 @@ import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg;
 public interface IMesShiftGroupCenterCfgService extends IBaseMesService<MesShiftGroupCenterCfg> {
 
 
+    ListPager<MesShiftGroupCenterCfg> queryMesShiftGroupCenterCfgByPager(MesShiftGroupCenterCfg mesShiftGroupCenterCfg, Pager pager);
 }

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

@@ -1,8 +1,18 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupCenterCfgService;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
 
@@ -13,4 +23,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShiftGroupCenterCfg")
 public class MesShiftGroupCenterCfgController extends BaseMesController<MesShiftGroupCenterCfg> {
+
+    @Autowired
+    private IMesShiftGroupCenterCfgService mesShiftGroupCenterCfgService;
+
+    @GetMapping("/query-pager")
+    @ApiOperation(value = "产线与班组的对应关系")
+    public ResultBean queryMesShiftGroupCenterCfgByPager(MesShiftGroupCenterCfg mesShiftGroupCenterCfg, Pager pager) {
+        try {
+            mesShiftGroupCenterCfg.setOrganizeCode(AuthUtil.getOrganizeCode());
+            ListPager<MesShiftGroupCenterCfg> partInspectionListPager = mesShiftGroupCenterCfgService.queryMesShiftGroupCenterCfgByPager(mesShiftGroupCenterCfg, pager);
+            return ResultBean.success("查询成功").setListPager(partInspectionListPager);
+        } catch (ImppBusiException imppException) {
+            return ResultBean.fail(imppException);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description :
@@ -102,4 +104,25 @@ public class WmsSAPDbQuery {
         }
         return String.format(LocaleUtils.getLocaleRes(msg), args);
     }
+
+    /**
+     * 根据物料编码查询物料名称
+     *
+     * @param organizeCode 工厂代码
+     * @param partNo       物料编码
+     * @return 物料名称
+     * @throws Exception
+     */
+    public String partName(String organizeCode, String partNo) throws Exception {
+        String sqlString = "select part_name from mes_part where organize_code='" + organizeCode
+                + "' and part_no='" + partNo
+                + "' and is_deleted=2 and is_valid=1";
+
+        List<Map<String, Object>> result = mesDataSourceProxy.queryMapList(sqlString, srcConn);
+
+        if (result == null || result.size() == 0) {
+            return "";
+        }
+        return result.get(0).get("part_name").toString();
+    }
 }

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

@@ -22,7 +22,7 @@ public class MesEquipmentProdParamCfgServiceImpl extends BaseMesService<MesEquip
     @Override
     protected void setPackQueryBean(MesEquipmentProdParamCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"pid",packBean);
+//        DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"pid",packBean);
         DdlPreparedPack.getNumEqualPack(bean.getSourceId(),"sourceId",packBean);
     }
 

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

@@ -3,20 +3,30 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupCenterCfgService;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+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.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
 import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg;
+import cn.estsh.i3plus.pojo.mes.repository.MesShiftGroupCenterCfgRepository;
 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;
+
 @Service
 @Slf4j
 public class MesShiftGroupCenterCfgService extends BaseMesService<MesShiftGroupCenterCfg> implements IMesShiftGroupCenterCfgService {
 
+    @Autowired
+    private MesShiftGroupCenterCfgRepository mesShiftGroupCenterCfgRDao;
+
     protected void setPackQueryBean(MesShiftGroupCenterCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getShiftGroupName(), "shiftGroupName", packBean);
@@ -63,4 +73,17 @@ public class MesShiftGroupCenterCfgService extends BaseMesService<MesShiftGroupC
         }
     }
 
+    @Override
+    public ListPager<MesShiftGroupCenterCfg> queryMesShiftGroupCenterCfgByPager(MesShiftGroupCenterCfg bean, Pager pager) {
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
+        pager = PagerHelper.getPager(pager, mesShiftGroupCenterCfgRDao.findByHqlWhereCount(packBean));
+
+        List<MesShiftGroupCenterCfg> resultList = mesShiftGroupCenterCfgRDao.findByHqlWherePage(packBean, pager);
+
+        return new ListPager<>(resultList, pager);
+    }
 }

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

@@ -34,6 +34,8 @@ public class MesShiftService extends BaseMesService<MesShift> implements IMesShi
         ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空");
         ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空");
         ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空");
+        ValidatorBean.checkNotNull(item.getBeginDate(), "执行开始日期不能为空");
+        ValidatorBean.checkNotNull(item.getEndDate(), "执行结束日期不能为空");
 /*
         ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空");
 */
@@ -42,12 +44,16 @@ public class MesShiftService extends BaseMesService<MesShift> implements IMesShi
         DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean);
         DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", cellBinPackBean);
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", cellBinPackBean);
+        cellBinPackBean.setWhereAppend(cellBinPackBean.getWhereAppend()+" " +
+                " and ((model.beginDate <= '"+item.getBeginDate()+"' and model.endDate >= '"+item.getBeginDate()+"')"+
+                " or (model.beginDate <= '"+item.getEndDate()+"' and model.endDate >= '"+item.getEndDate()+"')" +
+                " or (model.beginDate >= '"+item.getBeginDate()+"' and model.endDate <= '"+item.getEndDate()+"'))" );
         boolean flg = baseRDao.isExitByHql(cellBinPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】区域【%s】产线【%s】班次代码已经存在，请检查数据", item.getAreaCode(), item.getWorkCenterCode(), item.getShiftCode())
+                    .setErrorDetail("【%s】区域【%s】产线【%s】班次代码生效时间内已经存在有效数据，请检查数据", item.getAreaCode(), item.getWorkCenterCode(), item.getShiftCode())
                     .build();
         }
     }
@@ -61,6 +67,8 @@ public class MesShiftService extends BaseMesService<MesShift> implements IMesShi
         ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空");
         ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空");
         ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空");
+        ValidatorBean.checkNotNull(item.getBeginDate(), "执行开始日期不能为空");
+        ValidatorBean.checkNotNull(item.getEndDate(), "执行结束日期不能为空");
 /*
         ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空");
 */
@@ -69,13 +77,17 @@ public class MesShiftService extends BaseMesService<MesShift> implements IMesShi
         DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean);
         DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", cellBinPackBean);
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", cellBinPackBean);
+        cellBinPackBean.setWhereAppend(cellBinPackBean.getWhereAppend()+" " +
+                " and ((model.beginDate <= '"+item.getBeginDate()+"' and model.endDate >= '"+item.getBeginDate()+"')"+
+                " or (model.beginDate <= '"+item.getEndDate()+"' and model.endDate >= '"+item.getEndDate()+"')" +
+                " or (model.beginDate >= '"+item.getBeginDate()+"' and model.endDate <= '"+item.getEndDate()+"'))" );
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean);
         boolean flg = baseRDao.isExitByHql(cellBinPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】区域【%s】产线【%s】班次代码已经存在，请检查数据", item.getAreaCode(), item.getWorkCenterCode(), item.getShiftCode())
+                    .setErrorDetail("【%s】区域【%s】产线【%s】班次代码生效时间内已经存在有效数据，请检查数据", item.getAreaCode(), item.getWorkCenterCode(), item.getShiftCode())
                     .build();
         }
     }