Merge pull request 'dev' (#21) from dev into pre-production

Reviewed-on: #21

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -64,7 +64,7 @@
         lwtt.tray_type
         FROM
         logpm_warehouse_tray AS tray
-        left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id
+        left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id and lwtt.is_deleted=0
         INNER JOIN logpm_warehouse_warehouse AS warehouse ON tray.warehouse_id = warehouse.id
         <where>
             tray.is_deleted = '0'

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java

@@ -213,6 +213,9 @@ public class ZbomNodeDataPushListener {
 				paramDTO.setNode(zbNode.getCode());
 				ZbFactoryNodeOrderEntity nodeOrderEntity = nodeOrderMap.get(departCode + platformOrderCode);
 				ZbomNodeEnums currentNode = zbNode;
+				if (ObjectUtil.isEmpty(nodeOrderEntity)) {
+					nodeOrderEntity = new ZbFactoryNodeOrderEntity();
+				}
 				// 如果是签收节点，需要判断是否为全部签收和部分签收
 				if (EnumUtil.equals(NodeEnums.CLERK_REVIEW, node)) {
 					// 签收节点设置签收数量
@@ -221,9 +224,7 @@ public class ZbomNodeDataPushListener {
 
 					// 签收环节上一个节点是在途，说明缺少一个送货抵达,需要补一个节点
 					if (ObjectUtil.isEmpty(nodeOrderEntity) || ObjectUtil.equal(nodeOrderEntity.getCurrentNode(), ZbomNodeEnums.INTRANSIT.getIndex())) {
-						if (ObjectUtil.isEmpty(nodeOrderEntity)) {
-							nodeOrderEntity = new ZbFactoryNodeOrderEntity();
-						}
+
 						// 第一次签收，节点改为送货抵达
 						paramDTO.setNode(ZbomNodeEnums.DELIVERY_ARRIVAL.getCode());
 						currentNode = ZbomNodeEnums.DELIVERY_ARRIVAL;

blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportBillLoadingController.java

@@ -52,8 +52,8 @@ public class ReportBillLoadingController {
 			.node(nodeEnums)
 			.brand(BrandEnums.ZB)
 			.operatorTime(new Date())
-			.operator("test")
-			.address("test")
+			.operator((String) map.get("operator"))
+			.address((String) map.get("address"))
 			.content((List<Object>) map.get("content"))
 			.build();
 		sender.sendNodeDataByBrand(build);