Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -92,8 +92,8 @@ public class ApsServiceImpl implements ApsService {
         }else{
             try {
                 // 加锁最大1小时
-                rLock.lock(1, TimeUnit.HOURS);
-                redisService.redisCatchInit("apsUser-"+tenantId,currentUser,3600);
+                rLock.lock(4, TimeUnit.HOURS);
+                redisService.redisCatchInit("apsUser-"+tenantId,currentUser,3600*4);
                 // 合并待发布未锁定的订单一起排程
                 String idStrs = null;
                 if(apsBlankOrders != null && apsBlankOrders.size()>0){
@@ -233,6 +233,8 @@ public class ApsServiceImpl implements ApsService {
                         // APS平台排程接口调用
                         ProductionScheduleRetVo productionScheduleRetVo = rwApsServer.productionSchedule(productionScheduleVo);
                         if (!"200".equals(productionScheduleRetVo.getCode())) {
+                            /*processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>().set(ApsProcessOperationProcessEquDo::getLockmark,"y")
+                                    .in(ApsProcessOperationProcessEquDo::getBlankid,blankOrderIds));*/
                             throw new CustomException(productionScheduleRetVo.getMsg());
                         }
                         // 获取坯料计划
@@ -810,7 +812,7 @@ public class ApsServiceImpl implements ApsService {
         if (StringUtils.isNotBlank(operationDo.getCanchoosedeviceid())) {
             String[] sbIds = operationDo.getCanchoosedeviceid().split(",");
             for (String equIds : sbIds) {
-                if(equIds.equals("0001be252874536843730b100124")){
+                if(equIds.equals("0001be252874536843730b100055")){
                     System.out.println(equIds);
                 }
                 AspCheckItemsDo checkItemsD = eqMaps.get(equIds);