Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java

@@ -132,5 +132,5 @@ public interface DsTaskingMapper extends BaseMapper<DsTaskingEntity> {
 
 	List<DsPartEntity> getOldMesAllPart(@Param("startTime") String startTime,
 										@Param("endTime") String endTime,
-										@Param("partCode") String partCode);
+										@Param("partCodeList") List<String> partCodeList);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml

@@ -144,9 +144,12 @@
           AND UPDATE_TIME BETWEEN to_date(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')
               AND to_date(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
        </if>
-       <if test="partCode != null and partCode !=''">
-           AND part_code = #{partCode}
-       </if>
+        <if test="partCodeList != null">
+            and part_code in
+            <foreach collection="partCodeList" item="partCode" open="(" close=")" separator=",">
+                #{partCode}
+            </foreach>
+        </if>
 
     </select>
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -1572,10 +1572,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 
 	@Override
 	public boolean syncPart(String startTime, String endTime,String partCode) {
+		List<String> codeList = Arrays.asList(partCode.split(","));
 		//查询所有老mes零件
-		List<DsPartEntity> dsPartEntityList =  taskingMapper.getOldMesAllPart(startTime,endTime,partCode);
+		List<DsPartEntity> dsPartEntityList =  taskingMapper.getOldMesAllPart(startTime,endTime,codeList);
 		for (DsPartEntity partEntity : dsPartEntityList) {
-
 			// 2. 递归处理零件及其子件
 			DsPartEntity newPart = processPartRecursively(partEntity);
 			if (newPart == null) {

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml

@@ -55,6 +55,7 @@
         FROM
             MES_YIELD_ORDER a
             LEFT JOIN DS_PART b ON a.PART_CODE = b.PART_CODE
+            LEFT JOIN DS_PART_VERSION d ON b.ID = d.PART_ID AND a.PART_VERSION = d.PART_VERSION AND a.PART_CODE = d.PART_CODE
             LEFT JOIN MES_YIELD_ORDER_CRAFT c ON a.id = c.yo_id
         <where>
             a.is_deleted = 0 AND c.WORK_CENTER_ID IS NOT NULL

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -129,9 +129,9 @@
             <if test="woCode !=null and woCode != ''">
                 and a.wo_code = #{woCode}
             </if>
-            <if test="teamName !=null and teamName != ''">
+            <!--<if test="teamName !=null and teamName != ''">
                 and c.ts_name = #{teamName}
-            </if>
+            </if>-->
             <if test="equipName !=null and equipName != ''">
                 and b.equip_name = #{equipName}
             </if>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -282,6 +282,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             LinkedHashMap::new
                     ));
         }
+        //根据班组名称过滤
+        if(StringUtils.isNotEmpty(workOrder.getTeamName())){
+            woCodeGroup = woCodeGroup.entrySet().stream()
+                    .filter(entry -> {
+                        return entry.getValue().stream()
+                                .anyMatch(dto -> workOrder.getTeamName().equals(dto.getTeamName()));
+                    })
+                    .collect(Collectors.toMap(
+                            Map.Entry::getKey,
+                            Map.Entry::getValue,
+                            (oldValue, newValue) -> oldValue,
+                            LinkedHashMap::new
+                    ));
+        }
         List<WorkOrderDto> resultList = new ArrayList<>();
         for (Map.Entry<String, List<WorkOrderDto>> entry : woCodeGroup.entrySet()) {
             //根据工序名称过滤订单
@@ -413,9 +427,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                   Map<Long, String> craftAbilityMap) {
         List<StGlassCakeOutDTO> glassCakeOutList = new ArrayList<>();
         List<WorkOrderEntity> workOrderList = new ArrayList<>();
-        list = mergeYieldOrderList(list);
+        //list = mergeYieldOrderList(list);
         LocalDateTime localDateTime = LocalDateTime.now();
         for (YieldOrderEntity order : list) {
+            log.info("当前订单id是：" + order.getId());
             try {
                 DsPartVersionEntity partVersion = partVersionService.getOne(Wrappers.<DsPartVersionEntity>lambdaQuery().eq(DsPartVersionEntity::getPartCode,order.getPartCode()).eq(DsPartVersionEntity::getPartVersion,order.getPartVersion()));
                 if(partVersion == null){
@@ -463,6 +478,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
                 for (int i = 0; i < craftList.size(); i++) {
                     YieldOrderCraftEntity craft = craftList.get(i);
+                    log.info("当前订单是：" + order.getId() + ",工序是：" + craft.getId());
                     //如果是外协的话，去查询外协工序时间，若未查询到先默认3天，跳过该工序的排产
                     if (craft.getIsOutsource()) {
                         OutsourceProcessEntity outsourceProcess = outsourceProcessService.getOne(Wrappers.<OutsourceProcessEntity>lambdaQuery().eq(OutsourceProcessEntity::getProcessId, craft.getPpsId()));
@@ -891,7 +907,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 log.error("报错订单是：" + order.getId() + ",报错信息是：" + e.getMessage());
                 throw new RuntimeException(e);
             }
-
+            log.info("当前订单：" + order.getId() + "结束！");
         }
         if(CollectionUtils.isNotEmpty(glassCakeOutList)){
             glassCakeOutClient.batchGeneratePreOutOrder(glassCakeOutList);
@@ -1237,6 +1253,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     }
 
     public Map<String, List<WorkPlanEntity>> dealCommonCraftOrders() {
+        log.info("处理前置公共工序开始！");
         List<YieldOrderEntity> commonCraftOrderList = yieldOrderService.selectCommonCraftOrderList();
         Map<String, List<WorkPlanEntity>> planMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(commonCraftOrderList)) {
@@ -1295,6 +1312,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
 
         }
+        log.info("处理前置公共工序结束！");
         return planMap;
     }
 
@@ -1513,7 +1531,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             //获取当前工序的所有温度曲线
             List<SintTempCurveEntity> sintList = sintMap.get(craft.getPpsId());
             List<List<String>> sintMaterialList = new ArrayList<>();
-            sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(","))));
+            sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(" "))));
 
             //根据零件号获取子件信息
             List<PartRelationEntity> partRelationList = partRelationService.list(Wrappers.<PartRelationEntity>lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));