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

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

@@ -201,17 +201,26 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
                 " sd.part_no, " +
                 " sd.modify_date_time, " +
                 " from  mes_shipping_detail  sd " +
-                " left join mes_work_order wo on wop.work_order_no=wo.work_order_no  " +
+                " left join mes_shipping s on s.id=sd.pid  " +
                 " WHERE  sd.status in (20) " +//todo 发运 20
                 " and sd.bar_code != '' and bar_code is not NULL ");
         hql.append(" and sd.organize_code = :organizeCode ");
         hql.append(" and sd.is_deleted = :isDeleted ");
         hql.append(" and sd.is_valid = :isValid ");
         if (!StringUtil.isEmpty(detail.getModifyDateTimeStart())){
-            hql.append(" and  sd.modify_date_time >= "+detail.getModifyDateTimeStart()+" ");
+            hql.append(" and  sd.modify_date_time >= '"+detail.getModifyDateTimeStart()+"' ");
         }
         if (!StringUtil.isEmpty(detail.getModifyDateTimeEnd())){
-            hql.append(" and  sd.modify_date_time <= "+detail.getModifyDateTimeEnd()+" ");
+            hql.append(" and  sd.modify_date_time <= '"+detail.getModifyDateTimeEnd()+"' ");
+        }
+        if (!StringUtil.isEmpty(detail.getShippingCode())){
+            hql.append(" and  s.shipping_code = '"+detail.getShippingCode()+"' ");
+        }
+        if (!StringUtil.isEmpty(detail.getTotalPartNo())){
+            hql.append(" and  sd.part_no = '"+detail.getTotalPartNo()+"' ");
+        }
+        if (!StringUtil.isEmpty(detail.getWorkOrderNo())){
+            hql.append(" and  sd.bar_code like '"+detail.getWorkOrderNo()+"%' ");
         }
 
         Query query = entityManager.createNativeQuery(hql.toString());
@@ -247,10 +256,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         hql.append(" and wop.is_valid = :isValid ");
 
         if (!StringUtil.isEmpty(detail.getPartNo())){
-            hql.append(" and wop.part_no ="+detail.getPartNo()+" ");
+            hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
         }
         if (!StringUtil.isEmpty(detail.getWorkCenterCode())){
-            hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" ");
+            hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' ");
         }
         hql.append(" and wop.work_order_no in (:codeList) ");
 
@@ -285,10 +294,10 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         hql.append(" and wop.is_valid = :isValid ");
 
         if (!StringUtil.isEmpty(detail.getPartNo())){
-            hql.append(" and wop.part_no ="+detail.getPartNo()+" ");
+            hql.append(" and wop.part_no ='"+detail.getPartNo()+"' ");
         }
         if (!StringUtil.isEmpty(detail.getWorkCenterCode())){
-            hql.append(" and wop.work_center_code ="+detail.getWorkCenterCode()+" ");
+            hql.append(" and wop.work_center_code ='"+detail.getWorkCenterCode()+"' ");
         }
         hql.append(" and wop.work_order_no in (:codeList) ");
 

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

@@ -169,7 +169,9 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
             for (Map.Entry<String, List<MesPartPullDetail>> stringListEntryDetail : pullCodeListMap.entrySet()) {
                 String pullCode = stringListEntryDetail.getKey();
                 List<MesPartPull> mesPartPulls = pullCodeMap.get(pullCode);
-                MesPartPull mesPartPull = mesPartPulls.get(0);//拉动组明细拉动单号对应拉动组
+                MesPartPull mesPartPull = mesPartPulls.get(0);
+                //拉动组明细拉动单号对应拉动组 如果拉动组产线跟工单产线不一致 不生成
+                if (mesWorkOrder.getWorkCenterCode().equals(mesPartPull.getWorkCenterCode())){
                     List<MesPartPullDetail> mesPartPullDetails = stringListEntryDetail.getValue();
                     //拉动组号+年月日+工单后5位
                     String orderNo = mesPartPull.getPullCode()+ TimeTool.getNowTime("yyMMdd") +
@@ -261,6 +263,8 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
 
                     mesPullingOrderExtendsRepository.insert(mesPullingOrderExtends);
                 }
+
+            }
             //6.产生拉动单后更新工单拉动状态为已拉动
             mesWorkOrder.setPullingStatus(MesExtEnumUtil.WORK_ORDER_PULLING_STATUS.SUBMIT.getValue());
             mesWorkOrderRepository.update(mesWorkOrder);