增加查询条件

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

@@ -40,7 +40,7 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
         hql.append(" from mes_loading_list as mll");
         hql.append(" inner join  mes_loading_list_detail as mlld on mll.id = mlld.pid");
         hql.append(" and mll.organize_code = mlld.organize_code and mll.is_deleted = mlld.is_deleted and mll.is_valid = mlld.is_valid  ");
-        hql.append(" inner join  mes_shipping as ms on mlld.shipping_id = ms.pid  ");
+        hql.append(" inner join  mes_shipping as ms on mlld.shipping_id = ms.id  ");
         hql.append(" and mlld.organize_code = ms.organize_code and mlld.is_deleted = ms.is_deleted and mlld.is_valid = ms.is_valid  ");
         hql.append(" where mll.organize_code = :organizeCode ");
         hql.append(" and mll.is_deleted = :isDeleted ");
@@ -50,6 +50,9 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
         if (!StringUtils.isEmpty(detail.getShippingCode())) {
             hql.append(" and mlld.shipping_code = :shippingCode ");
         }
+        if (!StringUtils.isEmpty(detail.getStatus())) {
+            hql.append(" and ms.status = :status ");
+        }
 
         Query query = entityManager.createNativeQuery(hql.toString());
 
@@ -61,6 +64,9 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
         if (!StringUtils.isEmpty(detail.getShippingCode())) {
             query.setParameter("shippingCode", detail.getShippingCode());
         }
+        if (!StringUtils.isEmpty(detail.getStatus())) {
+            query.setParameter("status", detail.getStatus());
+        }
 
         List list = query.getResultList();
 
@@ -98,7 +104,7 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
         hql.append(" from mes_loading_list as mll");
         hql.append(" inner join  mes_loading_list_detail as mlld on mll.id = mlld.pid");
         hql.append(" and mll.organize_code = mlld.organize_code and mll.is_deleted = mlld.is_deleted and mll.is_valid = mlld.is_valid  ");
-        hql.append(" inner join  mes_shipping as ms on mlld.shipping_id = ms.pid  ");
+        hql.append(" inner join  mes_shipping as ms on mlld.shipping_id = ms.id  ");
         hql.append(" and mlld.organize_code = ms.organize_code and mlld.is_deleted = ms.is_deleted and mlld.is_valid = ms.is_valid  ");
         hql.append(" where mll.organize_code = :organizeCode ");
         hql.append(" and mll.is_deleted = :isDeleted ");

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

@@ -1,7 +1,13 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+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.mes.bean.MesPartTypeDefect;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -9,4 +15,53 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartTypeDefectService extends BaseMesService<MesPartTypeDefect> implements IBaseMesService<MesPartTypeDefect> {
 
+
+    @Override
+    protected void setPackQueryBean(MesPartTypeDefect bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getPartTypeCode(), "partTypeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getDefectTypeCode(), "defectTypeCode", packBean);
+    }
+
+    @Override
+    protected void onInsertBean(MesPartTypeDefect item) {
+
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getDefectTypeCode(), "缺陷类型不能为空");
+        ValidatorBean.checkNotNull(item.getPartTypeCode(), "零件类型不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", roadPackBean);
+        DdlPreparedPack.getNumEqualPack(item.getPartTypeCode(), "partTypeCode", roadPackBean);
+
+        boolean flg = baseRDao.isExitByHql(roadPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("缺陷类型【%s】零件类型【%s】已经存在，请检查数据", item.getDefectTypeCode(), item.getPartTypeCode())
+                    .build();
+        }
+
+    }
+
+    @Override
+    protected void onUpdateBean(MesPartTypeDefect item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getDefectTypeCode(), "缺陷类型不能为空");
+        ValidatorBean.checkNotNull(item.getPartTypeCode(), "零件类型不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getDefectTypeCode(), "defectTypeCode", roadPackBean);
+        DdlPreparedPack.getNumEqualPack(item.getPartTypeCode(), "partTypeCode", roadPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
+        boolean flg = baseRDao.isExitByHql(roadPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("缺陷类型【%s】零件类型【%s】已经存在，请检查数据", item.getDefectTypeCode(), item.getPartTypeCode())
+                    .build();
+        }
+    }
+
 }

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

@@ -448,7 +448,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
 
         DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(originBean.getShippingCode(), "shippingCode", detailPackBean);
+        DdlPreparedPack.getNumEqualPack(originBean.getId(), "shippingId", detailPackBean);
         List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
 
         originBean.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CLOSE.getValue());