生产过程控制查询工单增加时间查询条件

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

@@ -3,10 +3,12 @@ package cn.estsh.i3plus.ext.mes.pcn.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.MesProdShiftRecord;
 import cn.estsh.i3plus.pojo.mes.bean.MesShift;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 产线与班次的对应关系
@@ -23,4 +25,7 @@ public interface IMesShiftService {
 
     @ApiOperation(value = "查询产线与班次的对应关系")
     public List<MesShift> queryMesShift(String organizeCode, String workCenterCode);
+
+    @ApiOperation(value = "获取当前班次时间日期")
+    Map<String,String> getShiftTimeMap(MesProdShiftRecord record);
 }

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

@@ -1,9 +1,10 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesProdShiftRecordService;
+import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService;
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.util.StationKvBeanUtil;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -18,12 +19,12 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import com.google.common.base.Objects;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 开关班记录
@@ -39,6 +40,10 @@ public class MesProdShiftRecordController   {
 
     @Autowired
     private IMesProductionCustomContextStepService productionCustomContextStepService;
+
+    @Autowired
+    private IMesShiftService mesShiftService;
+
     @GetMapping("/query-pager")
     @ApiOperation(value = "查询开关班记录")
     public ResultBean queryMesProdShiftRecordByPager(MesProdShiftRecord mesProdShiftRecord, Pager pager) {
@@ -121,12 +126,18 @@ public class MesProdShiftRecordController   {
 
     //封装展示组件班组班次内容
     private List<StationKvBean> getProdShiftData(MesProdShiftRecord record) {
-
+        List<StationKvBean> stationKvBeans = StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(),
-        return  StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(),
                 new StationKvBean("shiftGroup", "班组", record.getShiftGroup()),
                 new StationKvBean("shiftGroupName", "班组名称", record.getShiftGroup()),
                 new StationKvBean("shiftCode", "班次", record.getShiftCode()),
-                new StationKvBean("shiftName", "班次名称", record.getShiftName()))
+                new StationKvBean("shiftName", "班次名称", record.getShiftName()));
-                ;
+        //班次开始时间 ，班次结束时间
+        Map<String, String> shiftTimeMap = mesShiftService.getShiftTimeMap(record);
+        if (!java.util.Objects.isNull(shiftTimeMap)) {
+            StationKvBeanUtil.addStationKvBeanList(stationKvBeans,
+                    new StationKvBean(MesPcnExtConstWords.START_TIME,"开始时间",shiftTimeMap.get(MesPcnExtConstWords.START_TIME)),
+                    new StationKvBean(MesPcnExtConstWords.END_TIME,"结束时间",shiftTimeMap.get(MesPcnExtConstWords.END_TIME)));
+        }
+        return  stationKvBeans;
     }
 }

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

@@ -1,19 +1,29 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
+import cn.estsh.i3plus.mes.pcn.util.DateUtil;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 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.MesProdShiftRecord;
 import cn.estsh.i3plus.pojo.mes.bean.MesShift;
 import cn.estsh.i3plus.pojo.mes.repository.MesShiftRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 
 /**
@@ -49,4 +59,31 @@ public class MesShiftServiceImpl implements IMesShiftService {
         DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", packBean);
         return mesShiftRepository.findByHqlWhere(packBean);
     }
+
+    @Override
+    public Map<String, String> getShiftTimeMap(MesProdShiftRecord record) {
+        List<MesShift> shiftList = queryMesShift(record.getOrganizeCode(), record.getWorkCenterCode());
+        if (CollectionUtils.isEmpty(shiftList)) {
+            return null;
+        }
+        Optional<MesShift> shiftOptional = shiftList.stream().filter(t -> t.getShiftCode().equals(record.getShiftCode())).findFirst();
+        if (!shiftOptional.isPresent()) {
+            return null;
+        }
+        if (StringUtils.isEmpty(shiftOptional.get().getStartTime()) || StringUtils.isEmpty(shiftOptional.get().getEndTime()) || StringUtils.isEmpty(record.getStartTime())) {
+            return null;
+        }
+        String startData = TimeTool.parseStringFormat(record.getStartTime(), DateUtil.BASE_FORMAT, DateUtil.SHORT_FORMAT);
+        //白班
+        String startTime = startData + " " + shiftOptional.get().getStartTime();
+        String endTime = startData + " " + shiftOptional.get().getEndTime();
+        //晚班
+        if (MesExtEnumUtil.SHIFT_CODE.SHIFT_CODE_20.getValue().equals(record.getShiftCode())) {
+            endTime = TimeTool.getToday(DateUtil.addDays(record.getStartTime(), 1)) + " " + shiftOptional.get().getEndTime();
+        }
+        Map<String, String> shiftTimeMap = new HashMap<>(2);
+        shiftTimeMap.put(MesPcnExtConstWords.START_TIME, startTime);
+        shiftTimeMap.put(MesPcnExtConstWords.END_TIME, endTime);
+        return shiftTimeMap;
+    }
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesBoxingErrorProofingService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@@ -67,6 +68,9 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
     @Autowired
     private IMesProduceSnExtService mesProduceSnExtService;
 
+    @Autowired
+    private IMesProductionRecordService mesProductionRecordService;
+
     @Override
     public ListPager<MesPackageDetail> queryMesPackageDetailByPager(MesPackage mesPackage, Pager pager) {
 
@@ -371,16 +375,21 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
             if (!MesExtEnumUtil.PRODUCE_SN_STATUS.checkAllowBoxingErrorProofing(nextMesProduceSn.getSnStatus()) || !MesExtEnumUtil.PRODUCE_QC_STATUS.checkAllowBoxingErrorProofing(nextMesProduceSn.getQcStatus())) {
                 MesPcnException.throwMesBusiException("条码【%s】状态【%s】质量状态【%s】不允许操作装箱防错，请检查数据！", mesPackageDetail.getSerialNumber(), MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(nextMesProduceSn.getSnStatus()), MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(nextMesProduceSn.getQcStatus()));
             }
-            //工艺校验
+        }
-            if(!Objects.isNull(packingDefine) && !Objects.isNull(packingDefine.getCheckCraftFlag()) && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == packingDefine.getCheckCraftFlag()){
+        //查询加工记录
-                if(StringUtils.isEmpty(packingDefine.getCraft())){
+        List<MesProductionRecord> productionRecordList = mesProductionRecordService.findProductionRecordList(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getSerialNumber());
-                    MesPcnException.throwMesBusiException("条码【%s】校验装箱防错对应工艺为空，请检查数据！", mesPackageDetail.getSerialNumber());
+        //工艺校验
-                }
+        if(!Objects.isNull(packingDefine) && !Objects.isNull(packingDefine.getCheckCraftFlag()) && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == packingDefine.getCheckCraftFlag()){
-                //校验条码是否经过该工艺
+            if(CollectionUtils.isEmpty(productionRecordList)){
-                Optional<MesProduceSn> produceSnOptional = produceSnList.stream().filter(t -> !StringUtils.isEmpty(t.getCraftCode()) && packingDefine.getCraft().equals(t.getCraftCode())).findFirst();
+                MesPcnException.throwMesBusiException("条码【%s】校验装箱防错对应工艺失败，加工记录信息不存在，请检查数据！", mesPackageDetail.getSerialNumber());
-                if(!produceSnOptional.isPresent()){
+            }
-                    MesPcnException.throwMesBusiException("条码【%s】校验装箱防错对应工艺【%s】失败，请检查数据！", mesPackageDetail.getSerialNumber(),packingDefine.getCraft());
+            if(StringUtils.isEmpty(packingDefine.getCraft())){
-                }
+                MesPcnException.throwMesBusiException("条码【%s】校验装箱防错对应工艺为空，请检查数据！", mesPackageDetail.getSerialNumber());
+            }
+            //校验条码是否经过该工艺
+            Optional<MesProductionRecord> productionRecordOptional = productionRecordList.stream().filter(t -> !StringUtils.isEmpty(t.getCraftCode()) && packingDefine.getCraft().equals(t.getCraftCode())).findFirst();
+            if(!productionRecordOptional.isPresent()){
+                MesPcnException.throwMesBusiException("条码【%s】校验装箱防错对应工艺【%s】失败，请检查数据！", mesPackageDetail.getSerialNumber(),packingDefine.getCraft());
             }
         }
     }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java

@@ -83,10 +83,6 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
             this.sendMessage(reqBean, new StationResultBean().writeDbLog(), "请先开班!",  MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT);
             MesPcnException.throwBusiException("请先开班!");
         }
-
-        //班次开始时间 ，班次结束时间
-        getShiftTimeStationKvBean(reqBean, prodShiftDataContext);
-
         // 发送班次班组和工单
         StationResultBean resultBean = getStationResultBean(reqBean, moduleContentContext, prodShiftDataContext);
         this.sendMessage(reqBean, resultBean);
@@ -112,25 +108,6 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
         ((IStepService) SpringContextsUtil.getBean("mesEquipByPassReadStepService")).executeInState(reqBean);
 
     }
-
-    private void getShiftTimeStationKvBean(StationRequestBean reqBean, List<StationKvBean> prodShiftDataContext) {
-        List<MesShift> shiftList = mesShiftService.queryMesShift(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode());
-        if (CollectionUtils.isEmpty(shiftList)){
-            return;
-        }
-        Optional<StationKvBean> shiftCodeOptional = prodShiftDataContext.stream().filter(shift -> MesPcnExtConstWords.SHIFT_CODE.equals(shift.getKey())).findFirst();
-        if (!shiftCodeOptional.isPresent()) {
-            return;
-        }
-        Optional<MesShift> shiftOptional = shiftList.stream().filter(t -> t.getShiftCode().equals(shiftCodeOptional.get().getValue())).findFirst();
-        if (!shiftOptional.isPresent()) {
-            return;
-        }
-        StationKvBeanUtil.addStationKvBeanList(prodShiftDataContext,
-                new StationKvBean(MesPcnExtConstWords.START_TIME, "班次开始时间", shiftOptional.get().getStartTime()),
-                new StationKvBean(MesPcnExtConstWords.END_TIME, "班次结束时间", shiftOptional.get().getEndTime()));
-    }
-
     private List<StationKvBean> getShiftRecordStationKvBeans(StationRequestBean reqBean) {
         // 获取班次信息 redis
         List<StationKvBean> prodShiftDataContext = productionCustomContextStepService.getProdShiftDataContext(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode());
@@ -230,11 +207,18 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
 
     //封装展示组件班组班次内容
     private List<StationKvBean> getProdShiftData(MesProdShiftRecord record) {
-
+        List<StationKvBean> stationKvBeans = StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(),
-        return  StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(),
                 new StationKvBean(MesPcnExtConstWords.SHIFT_GROUP, "班组", record.getShiftGroup()),
                 new StationKvBean(MesPcnExtConstWords.SHIFT_GROUP_NAME, "班组名称", record.getShiftGroupName()),
                 new StationKvBean(MesPcnExtConstWords.SHIFT_CODE, "班次", record.getShiftCode()),
                 new StationKvBean(MesPcnExtConstWords.SHIFT_NAME, "班次名称", record.getShiftName()));
+        //班次开始时间 ，班次结束时间
+        Map<String, String> shiftTimeMap = mesShiftService.getShiftTimeMap(record);
+        if (!java.util.Objects.isNull(shiftTimeMap)) {
+            StationKvBeanUtil.addStationKvBeanList(stationKvBeans,
+                    new StationKvBean(MesPcnExtConstWords.START_TIME,"开始时间",shiftTimeMap.get(MesPcnExtConstWords.START_TIME)),
+                    new StationKvBean(MesPcnExtConstWords.END_TIME,"结束时间",shiftTimeMap.get(MesPcnExtConstWords.END_TIME)));
+        }
+        return  stationKvBeans;
     }
 }