diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCustomerMallEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCustomerMallEntity.java index 0d339f6de..ae77471d7 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCustomerMallEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCustomerMallEntity.java @@ -35,19 +35,19 @@ import org.springblade.core.tenant.mp.TenantEntity; @EqualsAndHashCode(callSuper = true) public class AftersalesCustomerMallEntity extends TenantEntity { /** - * + *客服ID */ private Long customerServiceId; /** - * + *商场ID */ private Long clientId; /** - * + *客服名称 */ private String customerServiceName; /** - * + *商场名称 */ private String clientName; /** diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java index faafccbd4..953ea714d 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java @@ -207,10 +207,5 @@ public class BasicdataCarrierEntity extends TenantEntity { */ @ApiModelProperty(value = "预留5") private String reserve5; - /** - * id - */ - @ApiModelProperty(value = "id") - private Long id; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java index fde956de0..91d120e0c 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java @@ -319,6 +319,4 @@ public class BasicdataVehicleEntity extends TenantEntity { @ApiModelProperty(value = "预留5") private String reserve5; - @ApiModelProperty(value = "id") - private Long id; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java index 66b8dbaed..39fbc2e19 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java @@ -281,9 +281,4 @@ public class BasicdataWarehouseEntity extends TenantEntity { private Integer oldId; - /** - * 对应id - */ - @ApiModelProperty(value = "仓库id") - public Long id; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index fec559377..44266d556 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -451,16 +451,16 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "配载件数") private Integer carsLoadNum; /** - * 未入库数量 - */ +/* * 未入库数量 + *//* @TableField(exist = false) private Integer unreceivedQuantity; - /** + *//** * 创建用户id和时间 - */ + *//* @TableField(exist = false) private Long createUser; @TableField(exist = false) @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") - private Date createTime; + private Date createTime;*/ } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index a3bc07721..38b791adb 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -159,6 +159,8 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "ids") private List clientIds; + private Integer unreceivedQuantity; + public Map toMap() throws IllegalAccessException { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java index a06fb4ee9..98a923531 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java @@ -41,6 +41,9 @@ public class DistributionStockupStockListVO implements Serializable { private Integer unpack;//是否拆包 0 没有 1 拆了 private String sourceType;//是否拆包 1 订单 2导入 + + + // 货位ID 集合 private String allocations; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppPackageDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppPackageDetailVO.java new file mode 100644 index 000000000..02b2c78f8 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppPackageDetailVO.java @@ -0,0 +1,49 @@ +package com.logpm.distribution.vo.app; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DistributionAppPackageDetailVO implements Serializable { + + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderCode; + + /** + * 订单自编号 + */ + @ApiModelProperty(value = "包条码") + private String orderPackageCode; + + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private Integer isLoading; + + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private Integer type; + + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private Integer isSignfor; + + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private Integer isAbnormal; + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index 4ec7c3be0..e074d993d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -295,4 +295,16 @@ public class DistributionSignforAppController { } } + /** + * 查询签收包件列表 + * @param reservationId + * @return + */ + @GetMapping("/signingPackageDetail") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "查询签收包件列表" ) + public R signingPackageDetail(@RequestParam Long reservationId) { + return distributionSignforService.signingPackageDetail(reservationId); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java index ae415d128..08f35f04c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java @@ -275,6 +275,23 @@ public class DistrilbutionBillLadingController extends BladeController { return R.status(distrilbutionBillLadingService.ownSaveOrUpdate(distrilbutionBillLading)); } + + + /** + * 提货单 上传签收图片 + */ + @PostMapping("/signImages") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "上传签收图片", notes = "传入distrilbutionBillLading") + public R signImages(@Valid @RequestBody DistrilbutionBillLadingDTO distrilbutionBillLading) { + if(ObjectUtil.isEmpty(distrilbutionBillLading.getZeroType())){ + return R.fail(3003,"零担判断参数不能为空！！"); + } + return R.status(distrilbutionBillLadingService.signImages(distrilbutionBillLading)); + } + + + /** * 提货单 删除 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index bbef2c2a6..f3c54c30a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -70,7 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero); List selectStockupStockList(@Param("reservationId")Long reservationId); - List selectStockupStockListNew(@Param("reservationId")Long reservationId); + List selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId") Long warehouseId); Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 4672d55b8..09d6ec569 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -317,8 +317,8 @@ (SELECT SUM(aldrs.reality_num) FROM logpm_distribution_reservation_stocklist AS aldrs WHERE aldrs.reservation_id = #{reservationId} AND aldrs.stocklist_id in (t.aaa)) AS realNum, (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} AND newldrs.stocklist_id in (t.aaa)) AS planNum, ( - select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in ( - SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number) + select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number and warehouse_id=#{warehouseId} or association_value in ( + SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number and warehouse_id=#{warehouseId} ) ) as allocations FROM ( diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 814b17f1c..23c2ea57d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -25,10 +25,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; import com.logpm.distribution.vo.*; -import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO; -import com.logpm.distribution.vo.app.DistributionAppParcelListVO; -import com.logpm.distribution.vo.app.DistributionAppSignforVO; -import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; +import com.logpm.distribution.vo.app.*; import com.logpm.oldproject.dto.SignPushDataUnitDTO; import org.apache.ibatis.annotations.Param; import org.springblade.core.secure.BladeUser; @@ -309,4 +306,11 @@ public interface DistributionSignforMapper extends BaseMapper signingPackageDetail(@Param("reservationId") Long reservationId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 0d0d744c8..2a9f52810 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1230,4 +1230,53 @@ resultType="com.logpm.distribution.entity.DistributionSignforEntity"> SELECT * FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId} AND ldr.mall_mame = #{mallName} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index 7d4d58eb9..5a71f68d5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -173,7 +173,7 @@ public interface IDistributionReservationService extends BaseService selectStockupOrderList(Long reservationId,String isZero); - List selectStockupStockList(Long reservationId); + List selectStockupStockList(Long reservationId,Long warehouseId); Integer selectOrderNumByReservationId(Long reservationId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index dcfd9f2cc..cd1d25e66 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -272,4 +272,7 @@ public interface IDistributionSignforService extends BaseService distributionParcelListEntities = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()).ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue()).ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue()).notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()})); + if (Func.isEmpty(distributionParcelListEntities)) { + log.error("##############添加空订单"); + throw new RuntimeException(s.getOrderCode()+"无可用包件!!!"); + } distributionParcelListEntities.forEach(dp -> { if (!dp.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) { if (!Func.equals(dp.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(dp.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) { @@ -3141,13 +3145,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageListInfo = s.getPackageListInfo(); log.info("reservationEntity.getId()>>>>>>>>{}", reservationEntity.getId()); log.info("s.getId()>>>>>>>>{}", s.getId()); - List list = distributionReservationPackageMapper.selectList(Wrappers.query().lambda().eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()).eq(DistributionReservationPackageEntity::getStockArticleId, s.getId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, "2")); + List list = distributionReservationPackageMapper.selectList(Wrappers.query().lambda() + .eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()) + .eq(DistributionReservationPackageEntity::getStockArticleId, s.getId()) + .ne(DistributionReservationPackageEntity::getPacketBarStatus, "2")); // List distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(new QueryWrapper().lambda() // .eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()) // .eq(DistributionReservationPackageEntity::getStockArticleId, s.getId()) // ); if (Func.isEmpty(list)) { log.error("###########################预约包件查询错误:{}", list); + log.error("###########################查询错误预约Id:{}", reservationEntity.getId()); throw new RuntimeException("服务器正忙..."); } Map> oldPackageList = list.stream().collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index fa44537e7..36367e490 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -2863,8 +2863,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectStockupStockList(Long reservationId) { - return baseMapper.selectStockupStockListNew(reservationId); + public List selectStockupStockList(Long reservationId,Long warehouseId) { + return baseMapper.selectStockupStockListNew(reservationId,warehouseId); } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index b7b267aa9..43f09fb90 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -752,6 +752,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl details = baseMapper.signingPackageDetail(reservationId); + return R.data(details); + } + private boolean judgmentSignIsHavePackage(Long reservationId) { boolean flag = false; List distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index fb9a54b45..2939b2322 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1135,7 +1135,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl selectStockupStockList(StockupDTO stockupDTO) { + + Long reservationId = stockupDTO.getReservationId();//预约单id + DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId); + if (stockupDTO.getTypeService().equals("3")) { //自 List list = distributionStockupService.selectStockupSelf(reservationId); @@ -1163,7 +1167,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionReservationService.selectStockupStockList(reservationId); + List list = distributionReservationService.selectStockupStockList(reservationId,reservationEntity.getWarehouseId()); for (int i = 0; i < list.size(); i++) { DistributionStockupStockListVO distributionStockupStockListVO = list.get(i); if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index a15734165..8a37cf6a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -191,7 +191,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl 0){ //部分 distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); - }else if(1 == 0){ + }else if(i == 0){ //全部 distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); } @@ -618,6 +619,32 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl printEntityList = distributionPrintService.list(Wrappers.query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId())); + if (!printEntityList.isEmpty()) { + if (distrilbutionBillLading.getMark()) { + //要删除 + List collect = printEntityList.stream().map(DistributionPrintEntity::getId).collect(Collectors.toList()); + distributionPrintService.deleteLogic(collect); + //操作图片 + if (!distrilbutionBillLading.getPrintList().isEmpty()) { + addPrint(distrilbutionBillLading); + } + } + }else{ + //操作图片 + if (!distrilbutionBillLading.getPrintList().isEmpty()) { + addPrint(distrilbutionBillLading); + } + } + return false; + } + /** * 自提没有包件信息添加包件 * @param stockArticleId diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml index 694c50f77..c1481ffb4 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml @@ -13,7 +13,7 @@