合并 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 解决冲突: 使用origin/test 分支的MesWorkOrderService/MesCreateWorkOrderImpl 覆盖到dev

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

@@ -106,11 +106,12 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getVin())) {
             commonQueryHql.append("AND momd.vin like :vin ");
         }
-
+        if (!StringUtils.isEmpty(model.getCustOrderNo())) {
+            commonQueryHql.append("AND momd.custOrderNo like :custOrderNo ");
+        }
         if (!StringUtils.isEmpty(model.getBarCode())) {
             commonQueryHql.append("AND momd.barcode like :barcode ");
         }
-
         if (!StringUtils.isEmpty(model.getShippingCode())) {
             commonQueryHql.append("AND ms.shippingCode like :shippingCode ");
         }
@@ -126,6 +127,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustCode())) {
             commonQueryHql.append("AND ms.custCode like :custCode ");
         }
+        if (!StringUtils.isEmpty(model.getShippingGroupName())) {
+            commonQueryHql.append("AND ms.shippingGroupName like :shippingGroupName ");
+        }
         if (!StringUtils.isEmpty(model.getCustOrganizeCode())) {
             commonQueryHql.append("AND ms.custOrganizeCode = :custOrganizeCode ");
         }
@@ -164,11 +168,12 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getVin())) {
             dataQuery.setParameter("vin", model.getVin() + "%");
         }
-
+        if (!StringUtils.isEmpty(model.getCustOrderNo())) {
+            dataQuery.setParameter("custOrderNo", model.getCustOrderNo() + "%");
+        }
         if (!StringUtils.isEmpty(model.getBarCode())) {
             dataQuery.setParameter("barcode", model.getBarCode() + "%");
         }
-
         if (!StringUtils.isEmpty(model.getShippingCode())) {
             dataQuery.setParameter("shippingCode", model.getShippingCode() + "%");
         }
@@ -184,6 +189,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustCode())) {
             dataQuery.setParameter("custCode", model.getCustCode() + "%");
         }
+        if (!StringUtils.isEmpty(model.getShippingGroupName())) {
+            dataQuery.setParameter("shippingGroupName", "%" + model.getShippingGroupName() + "%");
+        }
         if (!StringUtils.isEmpty(model.getCustOrganizeCode())) {
             dataQuery.setParameter("custOrganizeCode", model.getCustOrganizeCode());
         }

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

@@ -2307,13 +2307,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             MesException.throwMesBusiException("物料【%s】对应bom信息不存在", partNo);
         }
         MesBom mesBom = mesBoms.get(0);
-        String effEndTime = mesBom.getEffEndTime();
+        String effStartTime = mesBom.getEffStartTime();
         String bomCode = mesBom.getBomCode();
 
         DdlPackBean ddlPackBean1 = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, ddlPackBean1);
-        DdlPreparedPack.getStringEqualPack(effEndTime, MesExtConstWords.EFF_START_TIME, ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(effStartTime, MesExtConstWords.EFF_START_TIME, ddlPackBean1);
-        DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", ddlPackBean1);
         //如果存在多个bomCode取最新的一个
         return mesBomRDao.findByHqlWhere(ddlPackBean1);
     }

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

@@ -225,7 +225,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                 String productVersion = prodVersion.getProductVersion();
                 mesWorkOrder.setProductVersion(productVersion);
             }
-             bom = mesBomService.findBom(organizeCode, prodVersion == null ? null : prodVersion.getAlternativePartList(), mesPartProdGroupDetail.getProductPartNo());
+            bom = mesBomService.findBom(organizeCode, prodVersion == null ? null : prodVersion.getAlternativePartList(), mesPartProdGroupDetail.getProductPartNo());
         }else {
             bom = mesBomService.findBom(organizeCode, mesPartProdGroupDetail.getProductPartNo());
         }
@@ -507,18 +507,18 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                  * 原pisces逻辑
                  * add by aix 2017.4.11 增加根据PTR维护页面维护的目视单显示项来替换WORKORDERASSEMBLY中的partdesc
                  */
-               if (!Objects.isNull(orderAssemblyList)){
+                if (!Objects.isNull(orderAssemblyList)){
-                   if (orderAssemblyList.getDisplaySeq()!=null && orderAssemblyList.getDisplaySeq()!=0){
+                    if (orderAssemblyList.getDisplaySeq()!=null && orderAssemblyList.getDisplaySeq()!=0){
-                       orderAssemblyList.setDisplayValue(mesPartPtr.getVisualItem());
+                        orderAssemblyList.setDisplayValue(mesPartPtr.getVisualItem());
-                   }
+                    }
-                   orderAssemblyList.setAssemblyPartNo(mesPartSap.getPartNo());
+                    orderAssemblyList.setAssemblyPartNo(mesPartSap.getPartNo());
-                   orderAssemblyList.setAssemblyPartName(mesPartSap.getPartName());
+                    orderAssemblyList.setAssemblyPartName(mesPartSap.getPartName());
-                   orderAssemblyList.setMatchRule(mesPartPtr.getReplacePartSnRule());
+                    orderAssemblyList.setMatchRule(mesPartPtr.getReplacePartSnRule());
-                   ptrInfos.append("INFO|").append(mesPartPtr.getId());
+                    ptrInfos.append("INFO|").append(mesPartPtr.getId());
-                   if (mesPartPtrDetail != null) {
+                    if (mesPartPtrDetail != null) {
-                       ptrInfos.append("PART|").append(mesPartPtrDetail.getId());
+                        ptrInfos.append("PART|").append(mesPartPtrDetail.getId());
-                   }
+                    }
-               }
+                }
             }
 
         }
@@ -871,8 +871,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
         DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(mesBom.getBomCode(), "bomCode", bomPackBean);
         DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomPackBean);
-        DdlPreparedPack.getStringSmallerPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean);
+        DdlPreparedPack.getStringEqualPack(mesBom.getEffStartTime(), MesExtConstWords.EFF_START_TIME, bomPackBean);
-        if (isWithEffEndTime) DdlPreparedPack.getStringBiggerPack(effectiveTime, MesExtConstWords.EFF_END_TIME, bomPackBean);
         List<MesBom> bomList = bomRao.findByHqlWhere(bomPackBean);
 
         for (MesBom bom : bomList) {