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

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/entity/CustomPushEntity.java

@@ -25,6 +25,9 @@ public class CustomPushEntity extends BaseEntity {
 	@ApiModelProperty(name = "订单号", notes = "")
 	private String orderCode;
 
+	@ApiModelProperty(name = "工厂车次号", notes = "")
+	private String departCode;
+
 	@ApiModelProperty(name = "仓库", notes = "")
 	private String warehouse;
 

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/job/CustomPushJob.java

@@ -332,7 +332,7 @@ public class CustomPushJob {
 
 				int size1 = customPushEntities.size();
 				List<ZbOrderPackageEntity> list = orderPackageService.list(Wrappers.<ZbOrderPackageEntity>lambdaQuery()
-					.select(ZbOrderPackageEntity::getDepartCode)
+					.select(ZbOrderPackageEntity::getDepartCode, ZbOrderPackageEntity::getPackageCode)
 					.eq(ZbOrderPackageEntity::getPackageCode, customPushEntity.getPackageCode())
 				);
 				if (CollUtil.isNotEmpty(list)) {
@@ -387,6 +387,7 @@ public class CustomPushJob {
 										customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 											.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 											.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+											.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 											.set(CustomPushEntity::getSendStatus, type)
 											.set(CustomPushEntity::getResultCode, "-1")
 											.set(CustomPushEntity::getResult, "工厂返回异常")
@@ -411,6 +412,10 @@ public class CustomPushJob {
 												.build();
 											// 推送成功
 											nodePushService.save(pushEntity);
+											orderPackageService.update(Wrappers.<ZbOrderPackageEntity>lambdaUpdate()
+												.set(ZbOrderPackageEntity::getSignStatus, 1)
+												.in(ZbOrderPackageEntity::getPackageCode, customPushEntities.stream().map(CustomPushEntity::getPackageCode).collect(Collectors.toSet()))
+											);
 											// 修改加盟商单号+发货单号节点数据
 											List<ZbFactoryNodeOrderEntity> list2 = nodeOrderService.list(Wrappers.<ZbFactoryNodeOrderEntity>lambdaQuery()
 												.eq(ZbFactoryNodeOrderEntity::getPlatformOrderCode, customPushEntity.getOrderCode())
@@ -432,6 +437,7 @@ public class CustomPushJob {
 											customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 												.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 												.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+												.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 												.set(CustomPushEntity::getSendStatus, type)
 												.set(CustomPushEntity::getResultCode, code)
 												.set(CustomPushEntity::getResult, result)
@@ -441,6 +447,7 @@ public class CustomPushJob {
 											customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 												.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 												.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+												.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 												.set(CustomPushEntity::getSendStatus, type)
 												.set(CustomPushEntity::getResultCode, code)
 												.set(CustomPushEntity::getResult, result));
@@ -459,6 +466,7 @@ public class CustomPushJob {
 						customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 							.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 							.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+							.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 							.set(CustomPushEntity::getSendStatus, type)
 							.set(CustomPushEntity::getResultCode, "-1")
 							.set(CustomPushEntity::getResult, "未找到包件订单-发货单订单")
@@ -468,6 +476,7 @@ public class CustomPushJob {
 					customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 						.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 						.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+						.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 						.set(CustomPushEntity::getSendStatus, type)
 						.set(CustomPushEntity::getResultCode, "-1")
 						.set(CustomPushEntity::getResult, "未找到包件订单-包件")
@@ -559,6 +568,7 @@ public class CustomPushJob {
 								customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 									.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 									.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+									.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 									.set(CustomPushEntity::getSendStatus, type)
 									.set(CustomPushEntity::getResultCode, code)
 									.set(CustomPushEntity::getResult, result)
@@ -568,6 +578,7 @@ public class CustomPushJob {
 								customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 									.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 									.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+									.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 									.set(CustomPushEntity::getSendStatus, type)
 									.set(CustomPushEntity::getResultCode, code)
 									.set(CustomPushEntity::getResult, result));
@@ -585,6 +596,7 @@ public class CustomPushJob {
 				customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 					.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 					.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+					.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 					.set(CustomPushEntity::getSendStatus, type)
 					.set(CustomPushEntity::getResultCode, "-1")
 					.set(CustomPushEntity::getResult, "push里有记录")
@@ -594,6 +606,7 @@ public class CustomPushJob {
 			customPushService.update(Wrappers.<CustomPushEntity>lambdaUpdate()
 				.eq(CustomPushEntity::getReservationId, customPushEntity.getReservationId())
 				.eq(CustomPushEntity::getOrderCode, customPushEntity.getOrderCode())
+				.eq(CustomPushEntity::getDepartCode, customPushEntity.getDepartCode())
 				.set(CustomPushEntity::getSendStatus, type)
 				.set(CustomPushEntity::getResultCode, "-1")
 				.set(CustomPushEntity::getResult, "未找到包件订单")

blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mapper/CustomPushMapper.xml

@@ -3,15 +3,15 @@
 <mapper namespace="com.logpm.factorydata.zbom.mapper.CustomPushMapper">
 
     <select id="findData" resultType="com.logpm.factorydata.zbom.entity.CustomPushEntity">
-        select tt.reservation_id,tt.order_code,tt.package_code,tt.examine_user_name,tt.signing_time
+        select tt.reservation_id,tt.order_code,tt.package_code,tt.examine_user_name,tt.signing_time,tt.depart_code
         from zb_custom_push tt
                  join (
-            select t.reservation_id,t.order_code
+            select t.reservation_id,t.order_code,t.depart_code
             from zb_custom_push t
             where t.send_status &lt; #{type}
-        group by t.reservation_id,t.order_code
+        group by t.reservation_id,t.order_code,t.depart_code,t.depart_code
         limit 1
-        ) aa on aa.order_code = tt.order_code and aa.reservation_id = tt.reservation_id
+        ) aa on aa.order_code = tt.order_code and aa.reservation_id = tt.reservation_id and aa.depart_code = tt.depart_code
         order by tt.signing_time
     </select>
 </mapper>