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

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesBom;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModelDetail;
 
 /**

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

@@ -19,4 +19,7 @@ public interface IMesProduceSnService extends IBaseMesService<MesProduceSn> {
 
     @ApiOperation(value = "查询条码信息")
     List<MesProduceSn> findMesProduceSnList(String organizeCode, List<String> snList);
+
+    @ApiOperation("根据客户条码查询产品条码表")
+    MesProduceSn getMesProduceSnByCustSn(String organizeCode, String custSn);
 }

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

@@ -2,6 +2,9 @@ package cn.estsh.i3plus.ext.mes.api.base;
 
 
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderAssembly;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
 
 /**
  * @Description : 工单装配件
@@ -11,4 +14,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderAssembly;
  * @Modify:
  **/
 public interface IMesWorkOrderAssemblyService extends IBaseMesService<MesWorkOrderAssembly> {
+
+    @ApiOperation("根据工单号查询排序线排产装配目视项")
+    List<MesWorkOrderAssembly> findMesWorkOrderAssembly(String workOrderNo, String organizeCode);
+
 }

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

@@ -5,6 +5,9 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderLog;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
 
 /**
  * @Description:
@@ -16,4 +19,7 @@ public interface IMesWorkOrderLogService extends IBaseMesService<MesWorkOrderLog
     void saveMesWorkOrderLog(MesWorkOrder mesWorkOrder, MesExtEnumUtil.WORK_ORDER_LOG_TYPE type,double qty);
 
     ListPager queryMesWorkOrderLogByPage(MesWorkOrderLog mesWorkOrderLog, Pager pager);
+
+    @ApiOperation("根据工单号查询生产工单日志")
+    List<MesWorkOrderLog> findMesWorkOrderLog(String workOrderNo, String organizeCode);
 }

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

@@ -2,6 +2,9 @@ package cn.estsh.i3plus.ext.mes.api.base;
 
 
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderPart;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
 
 /**
  * @Description : 工单零件
@@ -11,4 +14,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderPart;
  * @Modify:
  **/
 public interface IMesWorkOrderPartService extends IBaseMesService<MesWorkOrderPart> {
+
+    @ApiOperation("根据工单号查询工单零件")
+    List<MesWorkOrderPart> findMesWorkOrderPart(String workOrderNo, String organizeCode);
 }

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

@@ -18,4 +18,7 @@ public interface IMesWorkOrderToWmsService extends IBaseMesService<MesWorkOrderT
 
     @ApiOperation(value = "发送工单给Wms")
     List<MesWorkOrderToWms> saveMesWorkOrderToWms(MesWorkOrder mesWorkOrder, List<MesBom> mesBomList);
+
+    @ApiOperation("根据工单号查询工单发送给WMS数据")
+    List<MesWorkOrderToWms> findMesWorkOrderToWms(String workOrderNo, String organizeCode);
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesYfReportDaoImpl.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.ext.mes.apiservice.daoimpl.report;
 
 import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesYfReportDao;
-import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesDeviceDataQueryReportConditionModel;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesDeviceDataQueryReportResultModel;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
@@ -124,7 +123,7 @@ public class MesYfReportDaoImpl implements IMesYfReportDao {
         Query countQuery = entityManager.createQuery("select count(1) " + commonHql);
         setParameter(mesGeneralExportReportModel, countQuery);
         //数据
-        Query dataQuery = entityManager.createQuery(dataHql.append(commonHql).append(getOrderBy(mesGeneralExportReportModel)).toString(), MesShippingOrderManagementDetailModel.class);
+        Query dataQuery = entityManager.createQuery(dataHql.append(commonHql).append(getOrderBy(mesGeneralExportReportModel)).toString(), MesGeneralExportReportModel.class);
         setParameter(mesGeneralExportReportModel, dataQuery);
         if (Objects.isNull(pager)) return new ListPager<>(dataQuery.getResultList(), pager);
 
@@ -150,7 +149,7 @@ public class MesYfReportDaoImpl implements IMesYfReportDao {
             model.setOrderByParam("createDatetime");
             model.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
         }
-        return orderBy.append(" order by d.").append(model.getOrderByParam()).append(" ").append(CommonEnumUtil.ASC_OR_DESC.DESC.getValue() == model.getAscOrDesc() ? "desc" : "asc").toString();
+        return orderBy.append(" order by assembly.").append(model.getOrderByParam()).append(" ").append(CommonEnumUtil.ASC_OR_DESC.DESC.getValue() == model.getAscOrDesc() ? "desc" : "asc").toString();
     }
 
     private String getCommonHql(MesGeneralExportReportModel model) {

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

@@ -45,13 +45,8 @@ public class MesCutSchemeEquipmentServiceImpl extends BaseMesService<MesCutSchem
 
     @Override
     protected void setPackQueryBean(MesCutSchemeEquipment bean, DdlPackBean packBean) {
-        String cutCode = bean.getCutCode();
+        DdlPreparedPack.getStringLikerPack(bean.getCutCode(), "cutCode", packBean);
-        if (!StringUtils.isEmpty(cutCode)) {
+        DdlPreparedPack.getStringLikerPack(bean.getEquipmentCode(), "equipmentCode", packBean);
-            DdlPreparedPack.getStringLikerPack(cutCode, "packageTypeCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getEquipmentName(), "equipmentName", packBean);
-        }
-        String equipmentName = bean.getEquipmentName();
-        if (!StringUtils.isEmpty(equipmentName)) {
-            DdlPreparedPack.getStringLikerPack(equipmentName, "equipmentName", packBean);
-        }
     }
 }

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

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesCutSchemeFgService;
+import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeFg;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
@@ -27,4 +30,9 @@ public class MesCutSchemeFgServiceImpl extends BaseMesService<MesCutSchemeFg> im
         ValidatorBean.checkNotNull(item.getId(), "主键不能为空");
         ValidatorBean.checkNotNull(item.getCutCode(), "裁片方案代码不能为空");
     }
+
+    @Override
+    protected void setPackQueryBean(MesCutSchemeFg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCutCode(), MesExtConstWords.CUT_CODE, packBean);
+    }
 }

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

@@ -9,9 +9,9 @@ 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.MesLabelTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam;
-import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrder;
 import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateParamRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.util.CollectionUtils;
@@ -66,6 +66,7 @@ public class MesLabelTemplateServiceImpl extends BaseMesService<MesLabelTemplate
 
     @Override
     public MesLabelTemplate getLabelTemplate(String templateCode, String organizeCode) {
+        if(StringUtil.isEmpty(templateCode) || StringUtil.isEmpty(organizeCode)) return null;
         DdlPackBean templatePackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(templateCode, MesExtConstWords.TEMPLATE_CODE, templatePackBean);
         MesLabelTemplate mesLabelTemplate = baseRDao.getByProperty(templatePackBean);

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

@@ -23,6 +23,7 @@ public class MesPartProdGroupDetailService extends BaseMesService<MesPartProdGro
     protected void setPackQueryBean(MesPartProdGroupDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getProductPartNo(), "productPartNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "custPartNo", packBean);
 

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

@@ -33,6 +33,7 @@ public class MesPartProdGroupService extends BaseMesService<MesPartProdGroup> im
     public List<MesPartProdGroup> findMesPartProdGroup(MesPartProdGroupDetail mesPartProdGroupDetail){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getProductPartNo(),"productPartNo",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getWorkCenterCode(),"workCenterCode",ddlPackBean);
         List<MesPartProdGroupDetail> mesPartProdGroupDetails = mesPartProdGroupDetailRDao.findByHqlWhere(ddlPackBean);
         if(CollectionUtils.isEmpty(mesPartProdGroupDetails)){

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

@@ -48,4 +48,11 @@ public class MesProduceSnServiceImpl extends BaseMesService<MesProduceSn> implem
         }
         return produceSnList.stream().filter(Objects::nonNull).sorted(Comparator.comparing(MesProduceSn::getCreateDatetime).reversed()).collect(Collectors.toList());
     }
+
+    @Override
+    public MesProduceSn getMesProduceSnByCustSn(String organizeCode, String custSn) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(custSn, "custSn", packBean);
+        return baseRDao.getByProperty(packBean);
+    }
 }

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

@@ -4,10 +4,13 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderAssemblyService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 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.MesWorkOrderAssembly;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description : 工单装配件
  * @Reference :
@@ -25,4 +28,12 @@ public class MesWorkOrderAssemblyServiceImpl extends BaseMesService<MesWorkOrder
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue(),CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"processSeq","routeSeq"}, packBean);
     }
 
+    @Override
+    public List<MesWorkOrderAssembly> findMesWorkOrderAssembly(String workOrderNo, String organizeCode) {
+        if(StringUtil.isEmpty(workOrderNo) || StringUtil.isEmpty(organizeCode)) return null;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(workOrderNo,"workOrderNo",packBean);
+        return baseRDao.findByHqlWhere(packBean);
+    }
+
 }

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

@@ -2,9 +2,11 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderLogService;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.BeanUtil;
+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.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderLog;
@@ -134,4 +136,12 @@ public class MesWorkOrderLogService extends BaseMesService<MesWorkOrderLog> impl
         return new ListPager(mesWorkOrderLogList, pager);
 
     }
+
+    @Override
+    public List<MesWorkOrderLog> findMesWorkOrderLog(String workOrderNo, String organizeCode) {
+        if(StringUtil.isEmpty(workOrderNo) || StringUtil.isEmpty(organizeCode)) return null;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(workOrderNo,"workOrderNo",packBean);
+        return baseRDao.findByHqlWhere(packBean);
+    }
 }

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

@@ -3,10 +3,13 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderPartService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderPart;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description : 工单零件
  * @Reference :
@@ -23,4 +26,11 @@ public class MesWorkOrderPartServiceImpl extends BaseMesService<MesWorkOrderPart
         DdlPreparedPack.getStringEqualPack(bean.getWorkOrderNo(), "workOrderNo", packBean);
     }
 
+    @Override
+    public List<MesWorkOrderPart> findMesWorkOrderPart(String workOrderNo, String organizeCode) {
+        if(StringUtil.isEmpty(workOrderNo) || StringUtil.isEmpty(organizeCode)) return null;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(workOrderNo,"workOrderNo",packBean);
+        return baseRDao.findByHqlWhere(packBean);
+    }
 }

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

@@ -3,6 +3,9 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderToWmsService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.MathOperation;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesBom;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderToWms;
@@ -41,4 +44,12 @@ public class MesWorkOrderToWmsServiceImpl extends BaseMesService<MesWorkOrderToW
         }
         return mesWorkOrderToWmsList;
     }
+
+    @Override
+    public List<MesWorkOrderToWms> findMesWorkOrderToWms(String workOrderNo, String organizeCode) {
+        if(StringUtil.isEmpty(workOrderNo) || StringUtil.isEmpty(organizeCode)) return null;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(workOrderNo,"workOrderNo",packBean);
+        return baseRDao.findByHqlWhere(packBean);
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesYfReportServiceImpl.java

@@ -282,7 +282,7 @@ public class MesYfReportServiceImpl implements IMesYfReportService {
         DdlPreparedPack.getStringLikerPack(mesProductionRecord.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringBiggerPack(mesProductionRecord.getCompleteDateTimeStart(), "completeDateTime", packBean);
         DdlPreparedPack.getStringSmallerPack(mesProductionRecord.getCompleteDateTimeEnd(), "completeDateTime", packBean);
-        DdlPreparedPack.getStringEqualPack(mesProductionRecord.getEquipmentCode(), "equipmentCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getEquipmentCode(), "equipmentCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesProductionRecord.getEquipmentName(), "equipmentName", packBean);
         DdlPreparedPack.getStringLikerPack(mesProductionRecord.getMouldNo(), "mouldNo", packBean);
         DdlPreparedPack.getStringLikerPack(mesProductionRecord.getShiftGroup(), "shiftGroup", packBean);
@@ -290,8 +290,8 @@ public class MesYfReportServiceImpl implements IMesYfReportService {
         DdlPreparedPack.getNumEqualPack(mesProductionRecord.getReportStatus(), "reportStatus", packBean);
         DdlPreparedPack.getNumEqualPack(mesProductionRecord.getReportType(), "reportType", packBean);
         DdlPreparedPack.getNumEqualPack(mesProductionRecord.getIsComplete(), "isComplete", packBean);
-        DdlPreparedPack.getStringEqualPack(mesProductionRecord.getIsTest(), "isTest", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getIsTest(), "isTest", packBean);
-        DdlPreparedPack.getStringEqualPack(mesProductionRecord.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesProductionRecord.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(mesProductionRecord.getPartName(), "partName", packBean);
         return packBean;
     }