1.梦天推送订单数据逻辑修改

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/MtFactoryOrderMain.java

@@ -30,6 +30,10 @@ public class MtFactoryOrderMain extends BaseEntity {
 	@ApiModelProperty(value = "仓库类型")
 	private String warehouseType;
 
+	@JsonProperty("单据类型")
+	@ApiModelProperty(value = "单据类型")
+	private String orderType;
+
 	@JsonProperty("送货车号")
 	@ApiModelProperty(value = "送货车号")
 	private String sendCarNumber;

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/MtPackageInfo.java

@@ -23,6 +23,10 @@ public class MtPackageInfo extends BaseEntity {
 	@ApiModelProperty(value = "出库时间")
 	private String outboundDate;
 
+	@JsonProperty("数量")
+	@ApiModelProperty(value = "数量")
+	private Integer number;
+
 	@JsonProperty("包装编号")
 	@ApiModelProperty(value = "包装编号")
 	private String packageCode;

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

@@ -64,6 +64,32 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 	@Override
 	public R dealWithData(MtFactoryDataDTO mtFactoryDataDTO) {
 		log.info("#############dealWithData: 处理梦天工厂数据 开始");
+		String orderType = mtFactoryDataDTO.getOrderType();//单据类型
+		if("反冲单".equals(orderType)){
+			//如果是反冲单 就去把对应的包件信息逻辑删除
+			List<MtFactoryOrderDTO> orderList = mtFactoryDataDTO.getOrderList();
+			List<MtPackageInfo> updateList = new ArrayList<>();
+			for (MtFactoryOrderDTO mtFactoryOrderDTO:orderList){
+				String orderCode = mtFactoryOrderDTO.getOrderCode();
+				List<MtPackageInfoDTO> packageInfos = mtFactoryOrderDTO.getPackageInfos();
+				for (MtPackageInfoDTO mtPackageInfoDTO:packageInfos){
+					//根据包件码和订单自编码查询是否存在该包件
+					String packageCode = mtPackageInfoDTO.getPackageCode();
+					QueryWrapper<MtPackageInfo> queryWrapper = new QueryWrapper<>();
+					queryWrapper.eq("order_code",orderCode)
+						.eq("package_code",packageCode)
+						.eq("is_deleted",0);
+
+					MtPackageInfo mtPackageInfo = mtPackageInfoService.getOne(queryWrapper);
+					if(!Objects.isNull(mtPackageInfo)){
+						mtPackageInfo.setIsDeleted(1);
+						updateList.add(mtPackageInfo);
+					}
+				}
+			}
+			mtPackageInfoService.updateBatchById(updateList);
+			return R.success("SUCCESS");
+		}else {
 			String invoiceOrderCode = mtFactoryDataDTO.getInvoiceOrderCode();//发货单编码
 			//先判断该发货单编码是否已经存在
 			QueryWrapper<MtFactoryOrderMain> queryWrapper = new QueryWrapper<>();
@@ -140,6 +166,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 
 			return R.data(map);
 		}
+	}
 
 	@Override
 	public R handleData(OrderInfoDTO orderInfoDTO) throws NoSuchAlgorithmException {