feat(all): 修改金牌工厂问题

1 修改金牌入库回传问题

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java

@@ -166,10 +166,10 @@ public class NodeDataPushListener {
 						if (pushEntityMap.containsKey(orderCode)) {
 							continue;
 						}
-						String arriveFor = "stock";
+						String arriveFor = "carrier";
 						// PushOrderEntity pushOrderEntity = pushOrderEntityMap.get(orderCode);
 						if (ObjectUtil.isNotEmpty(pushOrderEntity) && StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) {
-							arriveFor = "carrier";
+							arriveFor = "stock";
 						}
 						PushOrderDetailEntity pushOrderDetailEntity = detailEntityMap.get(orderCode);
 						String boxCodeList = pushOrderDetailEntity.getBoxCodeList();
@@ -219,18 +219,6 @@ public class NodeDataPushListener {
 										.content(JSONUtil.toJsonStr(js))
 										.resultContent(result)
 										.build());
-									if (StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) {
-										js.set("arriveFor", "stock");
-										result = HttpUtil.post(url, JSONUtil.toJsonStr(js));
-										log.info("推送工厂结果：{}", result);
-										// 保存推送记录
-										factoryNodePushService.save(FactoryNodePushEntity.builder()
-											.orderCode(orderCode)
-											.node(FactoryNodeEnums.FINAL_NET_ARRIVE_CAR.getCode().toString())
-											.content(JSONUtil.toJsonStr(js))
-											.resultContent(result)
-											.build());
-									}
 								}
 							} catch (Exception e) {
 								log.error("推送工厂失败：{}", e);
@@ -249,7 +237,7 @@ public class NodeDataPushListener {
 						if (!CollUtil.contains(pushEntityMap.keySet(), pushData.getPackageCode())) {
 							String arriveFor = "stock";
 							// PushOrderEntity pushOrderEntity = pushOrderEntityMap.get(pushData.getOrderCode());
-							if (StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) {
+							if (StrUtil.isEmpty(pushOrderEntity.getWarehouse())) {
 								arriveFor = "carrier";
 							}
 							JSONObject js = new JSONObject();
@@ -264,7 +252,7 @@ public class NodeDataPushListener {
 							js.set("arriveFor", arriveFor);
 							JSONObject detailJson = new JSONObject();
 							detailJson.set(pushData.getPackageCode(), 1);
-							js.set("detail", detailJson.toString());
+							js.set("detail", detailJson);
 							js.set("shipNo", detailEntityMap.get(pushData.getOrderCode()).getShipNo());
 							log.info("推送工厂：{}", js);
 							String url = jinPaiProperties.getOldSystemHost() + jinPaiProperties.getOldSystemAlreadyStockedUrl();
@@ -280,19 +268,6 @@ public class NodeDataPushListener {
 										.packageCode(pushData.getPackageCode())
 										.resultContent(result)
 										.build());
-									if (StrUtil.isNotEmpty(pushOrderEntity.getWarehouse())) {
-										js.set("arriveFor", "stock");
-										result = HttpUtil.post(url, JSONUtil.toJsonStr(js));
-										log.info("推送工厂结果：{}", result);
-										// 保存推送记录
-										factoryNodePushService.save(FactoryNodePushEntity.builder()
-											.orderCode(pushData.getOrderCode())
-											.node(FactoryNodeEnums.END_WAREHOUSE_UNLOADING.getCode().toString())
-											.content(JSONUtil.toJsonStr(js))
-											.packageCode(pushData.getPackageCode())
-											.resultContent(result)
-											.build());
-									}
 								}
 							} catch (Exception e) {
 								log.error("推送工厂失败：{}", e);

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java

@@ -260,7 +260,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				if (size == index) {
 					packageVolume = volume.subtract(sum);
 				} else {
-					packageVolume = volume.divide(new BigDecimal(size), 6, RoundingMode.HALF_UP);
+					packageVolume = volume.divide(new BigDecimal(size), 4, RoundingMode.HALF_UP);
 					sum = sum.add(packageVolume);
 				}
 				// 封装包件