43050 报废条码的查询与报表打印

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

@@ -8,8 +8,11 @@ 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.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesOrg;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
+import cn.estsh.i3plus.pojo.mes.repository.MesOrgRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -17,13 +20,18 @@ import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
 public class MesPartInspectionService extends BaseMesService<MesPartInspection> implements IMesPartInspectionService {
     @Autowired
     private MesWorkCenterRepository mesWorkCenterRDao;
+
+    @Autowired
+    private MesOrgRepository mesOrgRDao;
     @Override
     protected void setPackQueryBean(MesPartInspection bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getSn(), "sn", packBean);
@@ -46,7 +54,11 @@ public class MesPartInspectionService extends BaseMesService<MesPartInspection>
         DdlPreparedPack.getStringEqualPack(bean.getSn(), "sn", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+        //3.增加产线查询条件，选用下拉框，支持多选
+        if(!StringUtil.isEmpty(bean.getWorkCenterCode())){
+            DdlPreparedPack.getInPackList(Arrays.asList(bean.getWorkCenterCode().split(",")), "workCenterCode", packBean);
+        }
+//        DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumEqualPack(bean.getNcStatus(), "ncStatus", packBean);
         if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", packBean, true);
@@ -54,6 +66,17 @@ public class MesPartInspectionService extends BaseMesService<MesPartInspection>
         if (StringUtils.isNotBlank(bean.getModifyDateTimeStart()) && StringUtils.isNotBlank(bean.getModifyDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getModifyDateTimeStart(), bean.getModifyDateTimeEnd(), "modifyDatetime", packBean, true);
         }
+        DdlPackBean packBeanLo = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(bean.getInventoryLocationCode(), "responsibleParty", packBeanLo);
+        List<MesOrg> orgList = mesOrgRDao.findByHqlWhere(packBeanLo);
+        //2.增加库区查询条件，文本框，支持模糊输入
+        if(!StringUtil.isEmpty(bean.getInventoryLocationCode())){
+            if (!CollectionUtils.isEmpty(orgList)){
+                DdlPreparedPack.getInPackList(orgList.stream().map(MesOrg::getResponsibleParty).
+                        filter(responsibleParty ->bean.getInventoryLocationCode().equals(responsibleParty)).collect(Collectors.toList()),
+                        "responsibleParty", packBean);
+            }
+        }
         pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
 
         List<MesPartInspection> resultList = baseRDao.findByHqlWherePage(packBean, pager);
@@ -68,6 +91,15 @@ public class MesPartInspectionService extends BaseMesService<MesPartInspection>
                         mesPartInspection.setWorkCenterName(mesWorkCenter.getWorkCenterName());
                     }
                 }
+                //1.页面增加库区字段（库区根据报废选择的责任人关联查询）
+                if (!StringUtils.isEmpty(mesPartInspection.getResponsibleParty())){
+                    if (!CollectionUtils.isEmpty(orgList)){
+                        List<MesOrg> collect = orgList.stream().filter(a -> bean.getResponsibleParty().equals(a.getResponsibleParty())).collect(Collectors.toList());
+                        if (!CollectionUtils.isEmpty(collect)){
+                            mesPartInspection.setInventoryLocationCode(collect.get(0).getInventoryLocationCode());
+                        }
+                    }
+                }
             }
         }
         return new ListPager<>(resultList, pager);