diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/HutoolConfigUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/HutoolConfigUtil.java index 65af046e3..3af09dbfd 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/HutoolConfigUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/HutoolConfigUtil.java @@ -10,7 +10,7 @@ import cn.hutool.json.JSONConfig; public class HutoolConfigUtil { public static JSONConfig jsonConfigByDataTimeFormat(){ - return new JSONConfig().setDateFormat("yyyy-MM-dd hh:mm:ss"); + return new JSONConfig().setDateFormat("yyyy-MM-dd HH:mm:ss"); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 0331af41b..9482e1af0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -320,7 +320,7 @@ newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2 AND FIND_IN_SET(newldrs.stocklist_id,t.aaa)) AS planNum, - GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations, + GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations FROM ( SELECT @@ -342,7 +342,6 @@ ) t LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number and ldslNew.quantity_stock !=0 LEFT JOIN logpm_distribution_stock ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa) - LEFT JOIN ( SELECT ldpl.material_code, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 435724849..b23057a23 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -3607,19 +3607,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl listByOrderPackageCode = distributionParcelListService.findListByOrderPackageCode(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()), myCurrentWarehouse.getId()); - // 根据品牌分组 - Map> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName)); - for (Map.Entry> entry : collect.entrySet()) { - String brand = entry.getKey(); - List list = entry.getValue(); - // 按订单分组 - Map> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode)); - for (Map.Entry> stringListEntry : collect1.entrySet()) { - String orderCode = stringListEntry.getKey(); - List list2 = stringListEntry.getValue(); + if (sum > 0){ + parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet())); + List listByOrderPackageCode = distributionParcelListService.findListByOrderPackageCode(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()), myCurrentWarehouse.getId()); + // 根据品牌分组 + Map> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName)); + for (Map.Entry> entry : collect.entrySet()) { + String brand = entry.getKey(); + List list = entry.getValue(); + // 按订单分组 + Map> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode)); + for (Map.Entry> stringListEntry : collect1.entrySet()) { + String orderCode = stringListEntry.getKey(); + List list2 = stringListEntry.getValue(); JSONObject js = new JSONObject(); js.put("boId", billLadingEntity.getId()); js.put("consignee", distrilbutionBillLadingEntity.getConsignee()); @@ -3641,6 +3642,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl packageInfoQueryWrapper = new QueryWrapper<>(); packageInfoQueryWrapper.eq("package_code", orderPackageCode); MtPackageInfo one = mtPackageInfoService.getOne(packageInfoQueryWrapper); @@ -474,7 +479,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { @Override public R sendReceiveInfoByNewSystem(MtReceiveDTO mtReceiveDTO) throws JsonProcessingException, NoSuchAlgorithmException { - + if(!mtFactoryProperties.getSendEnable()){ + return R.fail("发送数据已关闭"); + } List receiveContentList = mtReceiveDTO.getReceiveContentList(); @@ -685,6 +692,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { * @throws NoSuchAlgorithmException */ public String retryPushMtFactoryData(String url, String data) throws NoSuchAlgorithmException { + if(!mtFactoryProperties.getSendEnable()){ + return ""; + } return sendMtFactoryDataRequest(url, data); } @@ -698,7 +708,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { * @throws NoSuchAlgorithmException */ private R sendMtFactoryData(String url, String data, Integer type,String refCode) throws NoSuchAlgorithmException { - + if(!mtFactoryProperties.getSendEnable()){ + return R.fail(400, "当前数据不推送"); + } logger.info("##############sendMtFactoryData 发送数据: {}", data); String result = sendMtFactoryDataRequest(url, data); @@ -747,6 +759,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { * @throws NoSuchAlgorithmException */ private String sendMtFactoryDataRequest(String url, String data) throws NoSuchAlgorithmException { + if(!mtFactoryProperties.getSendEnable()){ + return ""; + } //先获取token String token = getMtToken(); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java index 6f12d86ff..67a513c99 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java @@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -81,28 +80,30 @@ public class MtOrderLogFailRetryServiceImpl implements MtOrderLogFailRetryServic */ protected void executeRetry(MtOrderLogEntity mtOrderLogEntity) { try { - String requestUrl = getRequestUrl(mtOrderLogEntity); + if(mtFactoryProperties.getSendEnable()){ - String result = mtFactoryDataService.retryPushMtFactoryData(requestUrl, mtOrderLogEntity.getReqArgs()); + String requestUrl = getRequestUrl(mtOrderLogEntity); - mtOrderLogEntity.setResBody(result); + String result = mtFactoryDataService.retryPushMtFactoryData(requestUrl, mtOrderLogEntity.getReqArgs()); - Integer PUSH_STATUS_FAIL = 1; - Integer PUSH_STATUS_SUCCESS = 2; - Integer PUSH_STATUS_EXPIRE = 3; - JSONObject jsonObject = JSONObject.parseObject(result); + mtOrderLogEntity.setResBody(result); - if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("Result")) { - mtOrderLogEntity.setPushStatus( - isExpire(mtOrderLogEntity.getCreateTime()) ? PUSH_STATUS_EXPIRE : PUSH_STATUS_FAIL - ); - } else { - mtOrderLogEntity.setPushStatus(PUSH_STATUS_SUCCESS); - } + Integer PUSH_STATUS_FAIL = 1; + Integer PUSH_STATUS_SUCCESS = 2; + Integer PUSH_STATUS_EXPIRE = 3; + JSONObject jsonObject = JSONObject.parseObject(result); - // 由于要存储每次的响应结果，所以每次请求后都立即保存 - mtOrderLogService.updateById(mtOrderLogEntity); + if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("Result")) { + mtOrderLogEntity.setPushStatus( + isExpire(mtOrderLogEntity.getCreateTime()) ? PUSH_STATUS_EXPIRE : PUSH_STATUS_FAIL + ); + } else { + mtOrderLogEntity.setPushStatus(PUSH_STATUS_SUCCESS); + } + // 由于要存储每次的响应结果，所以每次请求后都立即保存 + mtOrderLogService.updateById(mtOrderLogEntity); + } } catch (Exception e) { log.error("梦天重推 error", e); }