feat(all): 我乐工厂订单数据

1 修改我乐工厂订单重复包条码时，按老系统逻辑处理
2 修改我乐工厂回传数据时，缺少扫描时间字段问题

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java

@@ -1,6 +1,7 @@
 package com.logpm.factorydata.olo.mq;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -106,8 +107,8 @@ public class FactoryOrderListener {
 				String crmSo = vo.getCRM_SO();
 				String sn = vo.getSN();
 				if (entityMap.containsKey(crmSo + sn)) {
-					log.error("CRM单号:{} 与SN:{} 数据已经处理过了,logId: {}", crmSo, sn, logId);
-					continue;
+					log.info("CRM单号:{} 与SN:{} 订单+包件重复,logId: {}", crmSo, sn, logId);
+					sn = sn + "-" + DateUtil.format(DateUtil.date(), "MMdd") + "-补";
 				}
 				DeliveryNoteEntity entity = new DeliveryNoteEntity();
 				entity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null);

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

@@ -175,6 +175,7 @@ public class NodeDataPushListener {
 						JSONObject jsonObject = new JSONObject();
 						jsonObject.set("sn", stringIntegerEntry.getKey());
 						jsonObject.set("qty", stringIntegerEntry.getValue());
+						jsonObject.set("scanTime", entries.getStr("operatorTime"));
 						snArray.add(jsonObject);
 					}
 					js.set("snList", snArray);