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

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");
 	}
 
 }

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,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -3607,19 +3607,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						//存在资源释放操作
 						distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId());
 					}
-					parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
 					try {
-						List<DistributionParcelListEntity> listByOrderPackageCode = distributionParcelListService.findListByOrderPackageCode(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()), myCurrentWarehouse.getId());
+						if (sum > 0){
-						// 根据品牌分组
+							parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
-						Map<String, List<DistributionParcelListEntity>> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName));
+							List<DistributionParcelListEntity> listByOrderPackageCode = distributionParcelListService.findListByOrderPackageCode(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()), myCurrentWarehouse.getId());
-						for (Map.Entry<String, List<DistributionParcelListEntity>> entry : collect.entrySet()) {
+							// 根据品牌分组
-							String brand = entry.getKey();
+							Map<String, List<DistributionParcelListEntity>> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName));
-							List<DistributionParcelListEntity> list = entry.getValue();
+							for (Map.Entry<String, List<DistributionParcelListEntity>> entry : collect.entrySet()) {
-							// 按订单分组
+								String brand = entry.getKey();
-							Map<String, List<DistributionParcelListEntity>> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
+								List<DistributionParcelListEntity> list = entry.getValue();
-							for (Map.Entry<String, List<DistributionParcelListEntity>> stringListEntry : collect1.entrySet()) {
+								// 按订单分组
-								String orderCode = stringListEntry.getKey();
+								Map<String, List<DistributionParcelListEntity>> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
-								List<DistributionParcelListEntity> list2 = stringListEntry.getValue();
+								for (Map.Entry<String, List<DistributionParcelListEntity>> stringListEntry : collect1.entrySet()) {
+									String orderCode = stringListEntry.getKey();
+									List<DistributionParcelListEntity> 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<Distrilb
 									msg.setMain(JSONUtil.toJsonStr(js));
 									log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
 									factoryDataMessageSender.sendNodeDataByBrand(msg);
+								}
 							}
 						}
 					}catch (Exception e){

blade-service/logpm-factory-data/logpm-factory-data-base/src/main/java/com/logpm/factorydata/base/service/impl/MqServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONUtil;
 import com.logpm.factorydata.base.constant.MqConstants;
 import com.logpm.factorydata.base.entity.FailMsgEntity;
@@ -57,7 +58,8 @@ public class MqServiceImpl implements MqService {
 	@Override
 	public Boolean sendMsg(String exchange, String routingKey, Object msg, int delay) {
 		// 1.获取消息内容，如果非字符串将其序列化
-		String jsonMsg = (msg instanceof String) ? (String) msg : JSONUtil.toJsonStr(msg);
+		JSONConfig jsonConfig = JSONConfig.create().setDateFormat("yyyy-MM-dd HH:mm:ss");
+		String jsonMsg = (msg instanceof String) ? (String) msg : JSONUtil.toJsonStr(msg,jsonConfig);
 		String msgId = IdUtil.simpleUUID();
 		log.info("消息发送！exchange = {}, routingKey = {}, msg = {}, msgId = {}", exchange, routingKey, jsonMsg, msgId);
 		// 2.全局唯一的消息ID，需要封装到CorrelationData中

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -286,7 +286,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 	@Override
 	public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException, JsonProcessingException, NoSuchAlgorithmException {
 		logger.info("TAG {} #############handleStatusData: orderStatusDTO={}", FactoryConstant.MENGT,orderStatusDTO);
-
+		if(!mtFactoryProperties.getSendEnable()){
+			return R.fail(400, "当前数据不推送");
+		}
 		String status = orderStatusDTO.getStatus();
 
 		R rd = null;
@@ -324,6 +326,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 									  String distributionContactId,
 									  String destinationWarehouse
 	) throws JsonProcessingException, NoSuchAlgorithmException {
+		if(!mtFactoryProperties.getSendEnable()){
+			return R.fail(400, "当前数据不推送");
+		}
         QueryWrapper<MtPackageInfo> 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<MtReceiveContentDTO> 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();
 

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;
+				mtOrderLogEntity.setResBody(result);
-			Integer PUSH_STATUS_SUCCESS = 2;
-			Integer PUSH_STATUS_EXPIRE  = 3;
-			JSONObject jsonObject = JSONObject.parseObject(result);
 
-			if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("Result")) {
+				Integer PUSH_STATUS_FAIL    = 1;
-				mtOrderLogEntity.setPushStatus(
+				Integer PUSH_STATUS_SUCCESS = 2;
-					isExpire(mtOrderLogEntity.getCreateTime()) ? PUSH_STATUS_EXPIRE : PUSH_STATUS_FAIL
+				Integer PUSH_STATUS_EXPIRE  = 3;
-				);
+				JSONObject jsonObject = JSONObject.parseObject(result);
-			} else {
-				mtOrderLogEntity.setPushStatus(PUSH_STATUS_SUCCESS);
-			}
 
-			// 由于要存储每次的响应结果，所以每次请求后都立即保存
+				if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("Result")) {
-			mtOrderLogService.updateById(mtOrderLogEntity);
+					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);
 		}