diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 9e466186..347796a5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -25,13 +25,8 @@ import com.nflg.wms.common.pojo.vo.*; import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.WmsStructuralPackageOrder; -import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray; -import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTrayItem; -import com.nflg.wms.repository.service.IWmsStructuralPackageOrderService; -import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayItemService; -import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayService; -import com.nflg.wms.repository.service.IWmsStructuralPackageService; +import com.nflg.wms.repository.entity.*; +import com.nflg.wms.repository.service.*; import com.nflg.wms.starter.BaseController; import com.nflg.wms.starter.service.FileUploadService; import jakarta.annotation.Resource; @@ -88,6 +83,12 @@ public class StructuralPackageOrderController extends BaseController { @Resource private PackageMaterialScanRecordRepository packageMaterialScanRecordRepository; + @Resource + private IWmsStructuralPackageDeliverOrderService structuralPackageDeliverOrderService; + + @Resource + private IWmsStructuralPackageDeliverOrderMapService structuralPackageDeliverOrderMapService; + /** * 搜索SAP订单 * @param request 请求参数 @@ -228,7 +229,7 @@ public class StructuralPackageOrderController extends BaseController { * 搜索 */ @PostMapping("search") - public ApiResult> search(@Valid @RequestBody DeliverStructuralPackageOrderSearchQO request) { + public ApiResult> search(@Valid @RequestBody StructuralPackageOrderSearchQO request) { return ApiResult.success(deliverStructuralPackageOrderService.search(request)); } @@ -287,7 +288,7 @@ public class StructuralPackageOrderController extends BaseController { * 根据订单状态搜索 */ @PostMapping("searchByState") - public ApiResult> searchByState(@Valid @RequestBody DeliverStructuralPackageOrderSearchByStateQO request) { + public ApiResult> searchByState(@Valid @RequestBody StructuralPackageOrderSearchByStateQO request) { return ApiResult.success(deliverStructuralPackageOrderTrayService.searchByState(request)); } @@ -308,7 +309,7 @@ public class StructuralPackageOrderController extends BaseController { * @param request 搜索参数 */ @PostMapping("exportSearchByState") - public void exportSearchByState(HttpServletResponse response,@Valid @RequestBody @NotNull DeliverStructuralPackageOrderSearchByStateQO request) throws IOException { + public void exportSearchByState(HttpServletResponse response,@Valid @RequestBody @NotNull StructuralPackageOrderSearchByStateQO request) throws IOException { List list = deliverStructuralPackageOrderTrayService.searchByStateAll(request); if (CollectionUtil.isEmpty(list)){ list.add(new DeliverStructuralPackageOrderExtendVO()); @@ -504,7 +505,44 @@ public class StructuralPackageOrderController extends BaseController { return ApiResult.success(); } + /** + * 创建送货单 + * @param ids 托盘id + */ + @Transactional + @PostMapping("createDeliverOrder") + public ApiResult createDeliverOrder(@Valid @RequestBody @NotEmpty List ids) { + List trays = deliverStructuralPackageOrderTrayService.getListByIds(ids); + VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getPackageNo).collect(Collectors.toSet()).size() > 1) + .throwMessage("钢构包必须一致"); + VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getExternalOrderNo).collect(Collectors.toSet()).size() > 1) + .throwMessage("采购单号必须一致"); + Long packageId = trays.get(0).getPackageId(); + String externalOrderNo = trays.get(0).getExternalOrderNo(); + Long supplierId=trays.get(0).getSupplierId(); + List tids = deliverStructuralPackageOrderTrayService.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo); + VUtil.trueThrowBusinessError(tids.size() != ids.size()).throwMessage("数据未齐套"); + String deliverOrderNo = RandomUtil.randomString(10); + WmsStructuralPackageDeliverOrder deliverOrder = new WmsStructuralPackageDeliverOrder() + .setNo(deliverOrderNo) + .setSupplierId(supplierId) + .setCreateBy(UserUtil.getUserName()) + .setCreateTime(LocalDateTime.now()); + structuralPackageDeliverOrderService.save(deliverOrder); + structuralPackageDeliverOrderMapService.saveBatch(ids.stream().map(id -> new WmsStructuralPackageDeliverOrderMap() + .setDeliverId(deliverOrder.getId()) + .setOrderId(id)).toList()); + return ApiResult.success(); + } + /** + * 搜索送货单 + * @param request 查询参数 + */ + @PostMapping("searchDeliverOrder") + public ApiResult> searchDeliverOrder(@Valid @RequestBody @NotNull StructuralPackageDeliverOrderSearchQO request){ + return ApiResult.success(structuralPackageDeliverOrderService.search(request)); + } /** * 根据送货单号查询订单信息 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java new file mode 100644 index 00000000..bfcece1f --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java @@ -0,0 +1,22 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; + +@Data +public class StructuralPackageDeliverOrderSearchQO extends SearchBaseQO{ + + /** + * 送货单号 + */ + private String no; + + /** + * 采购单号 + */ + private String externalOrderNo; + + /** + * 供应商id + */ + private Long supplierId; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverStructuralPackageOrderSearchByStateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchByStateQO.java similarity index 88% rename from nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverStructuralPackageOrderSearchByStateQO.java rename to nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchByStateQO.java index a0503e3a..0e9d0911 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverStructuralPackageOrderSearchByStateQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchByStateQO.java @@ -5,7 +5,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; @Data -public class DeliverStructuralPackageOrderSearchByStateQO extends SearchBaseQO{ +public class StructuralPackageOrderSearchByStateQO extends SearchBaseQO{ /** * 订单状态 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverStructuralPackageOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java similarity index 84% rename from nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverStructuralPackageOrderSearchQO.java rename to nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java index 832ab6de..402c6161 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverStructuralPackageOrderSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java @@ -3,7 +3,7 @@ package com.nflg.wms.common.pojo.qo; import lombok.Data; @Data -public class DeliverStructuralPackageOrderSearchQO extends SearchBaseQO { +public class StructuralPackageOrderSearchQO extends SearchBaseQO { /** * 单据号 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java new file mode 100644 index 00000000..2dc98553 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java @@ -0,0 +1,63 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Data +@Accessors(chain = true) +public class StructuralPackageDeliverOrderVO { + + private Long id; + + /** + * 送货单号 + */ + private String no; + + /** + * 状态，0：待收货；1：已收货；2-已完结； + */ + private Short state; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 最后更新人 + */ + private String updateBy; + + /** + * 最后更新时间 + */ + private LocalDateTime updateTime; + + /** + * 供应商id + */ + private Long supplierId; + + /** + * 供应商代码 + */ + private Long supplierCode; + + /** + * 供应商名称 + */ + private Long supplierName; + + /** + * 工厂编号 + */ + private String factoryNo; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java new file mode 100644 index 00000000..be2b72d8 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java @@ -0,0 +1,68 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_structural_package_deliver_order") +public class WmsStructuralPackageDeliverOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 送货单号 + */ + private String no; + + /** + * 状态，0：待收货；1：已收货；2-已完结； + */ + private Short state; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 最后更新人 + */ + private String updateBy; + + /** + * 最后更新时间 + */ + private LocalDateTime updateTime; + + /** + * 供应商id + */ + private Long supplierId; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrderMap.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrderMap.java new file mode 100644 index 00000000..94b9669d --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrderMap.java @@ -0,0 +1,42 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_structural_package_deliver_order_map") +public class WmsStructuralPackageDeliverOrderMap implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 送货单id + */ + private Long deliverId; + + /** + * 订单id + */ + private Long orderId; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapMapper.java new file mode 100644 index 00000000..0943a9d0 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrderMap; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface WmsStructuralPackageDeliverOrderMapMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java new file mode 100644 index 00000000..a362fef4 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java @@ -0,0 +1,25 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.wms.common.pojo.qo.StructuralPackageDeliverOrderSearchQO; +import com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO; +import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrder; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface WmsStructuralPackageDeliverOrderMapper extends BaseMapper { + + IPage search(StructuralPackageDeliverOrderSearchQO request, List externalOrderIds, Page objectPage); + + List getIdsByExternalOrderNo(String externalOrderNo); +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderMapper.java index 3ba54837..008c0efd 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderMapper.java @@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO; +import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchQO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO; import com.nflg.wms.repository.entity.WmsStructuralPackageOrder; @@ -20,7 +20,7 @@ import java.util.List; */ public interface WmsStructuralPackageOrderMapper extends BaseMapper { - IPage search(DeliverStructuralPackageOrderSearchQO request, Page objectPage); + IPage search(StructuralPackageOrderSearchQO request, Page objectPage); List getList(String orderNo); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java index a2fca0ad..388ad182 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java @@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO; +import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchByStateQO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO; import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray; @@ -21,9 +21,9 @@ import java.util.List; */ public interface WmsStructuralPackageOrderTrayMapper extends BaseMapper { - IPage searchByState(@Param("request") DeliverStructuralPackageOrderSearchByStateQO request, Page objectPage); + IPage searchByState(@Param("request") StructuralPackageOrderSearchByStateQO request, Page objectPage); - List searchByState(@Param("request") DeliverStructuralPackageOrderSearchByStateQO request); + List searchByState(@Param("request") StructuralPackageOrderSearchByStateQO request); List getListByIds(List ids); @@ -32,4 +32,6 @@ public interface WmsStructuralPackageOrderTrayMapper extends BaseMapper getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderMapService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderMapService.java new file mode 100644 index 00000000..2d9a6d1d --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderMapService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrderMap; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsStructuralPackageDeliverOrderMapService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderService.java new file mode 100644 index 00000000..777d4fab --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderService.java @@ -0,0 +1,22 @@ +package com.nflg.wms.repository.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.common.pojo.qo.StructuralPackageDeliverOrderSearchQO; +import com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO; +import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrder; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsStructuralPackageDeliverOrderService extends IService { + + IPage search(@Valid @NotNull StructuralPackageDeliverOrderSearchQO request); +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderService.java index 94e26017..036a8037 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderService.java @@ -2,7 +2,7 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO; +import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchQO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO; import com.nflg.wms.repository.entity.WmsStructuralPackageOrder; @@ -24,7 +24,7 @@ public interface IWmsStructuralPackageOrderService extends IService search(@Valid DeliverStructuralPackageOrderSearchQO request); + IPage search(@Valid StructuralPackageOrderSearchQO request); List getList(@Valid @NotBlank String orderNo); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java index fae4bc55..a8a415dd 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java @@ -2,7 +2,7 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO; +import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchByStateQO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO; import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray; @@ -28,9 +28,9 @@ public interface IWmsStructuralPackageOrderTrayService extends IService deleteIds); - IPage searchByState(@Valid DeliverStructuralPackageOrderSearchByStateQO request); + IPage searchByState(@Valid StructuralPackageOrderSearchByStateQO request); - List searchByStateAll(DeliverStructuralPackageOrderSearchByStateQO request); + List searchByStateAll(StructuralPackageOrderSearchByStateQO request); List getListByIds(List ids); @@ -39,4 +39,6 @@ public interface IWmsStructuralPackageOrderTrayService extends IService getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderMapServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderMapServiceImpl.java new file mode 100644 index 00000000..fe5a5198 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderMapServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrderMap; +import com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapMapper; +import com.nflg.wms.repository.service.IWmsStructuralPackageDeliverOrderMapService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsStructuralPackageDeliverOrderMapServiceImpl extends ServiceImpl implements IWmsStructuralPackageDeliverOrderMapService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java new file mode 100644 index 00000000..c9df0c78 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java @@ -0,0 +1,40 @@ +package com.nflg.wms.repository.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.common.pojo.qo.StructuralPackageDeliverOrderSearchQO; +import com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO; +import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrder; +import com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapper; +import com.nflg.wms.repository.service.IWmsStructuralPackageDeliverOrderService; +import com.nflg.wms.repository.service.IWmsStructuralPackageOrderService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsStructuralPackageDeliverOrderServiceImpl extends ServiceImpl implements IWmsStructuralPackageDeliverOrderService { + + @Resource + private IWmsStructuralPackageOrderService wmsStructuralPackageOrderService; + + @Override + public IPage search(StructuralPackageDeliverOrderSearchQO request) { + List externalOrderIds = null; + if (StrUtil.isNotBlank(request.getExternalOrderNo())){ + externalOrderIds=baseMapper.getIdsByExternalOrderNo(request.getExternalOrderNo()); + } + return baseMapper.search(request,externalOrderIds,new Page<>(request.getPage(),request.getPageSize())); + } +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderServiceImpl.java index 6bbc1a4f..06786ca1 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.constant.OrderState; -import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO; +import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchQO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO; import com.nflg.wms.common.util.UserUtil; @@ -54,7 +54,7 @@ public class WmsStructuralPackageOrderServiceImpl extends ServiceImpl search(DeliverStructuralPackageOrderSearchQO request) { + public IPage search(StructuralPackageOrderSearchQO request) { return baseMapper.search(request,new Page<>(request.getPage(),request.getPageSize())); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java index fb5b7a30..5925f5fb 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO; +import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchByStateQO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO; import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO; import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray; @@ -41,12 +41,12 @@ public class WmsStructuralPackageOrderTrayServiceImpl extends ServiceImpl searchByState(DeliverStructuralPackageOrderSearchByStateQO request) { + public IPage searchByState(StructuralPackageOrderSearchByStateQO request) { return baseMapper.searchByState(request, new Page<>(request.getPage(), request.getPageSize())); } @Override - public List searchByStateAll(DeliverStructuralPackageOrderSearchByStateQO request) { + public List searchByStateAll(StructuralPackageOrderSearchByStateQO request) { return baseMapper.searchByState(request); } @@ -69,4 +69,9 @@ public class WmsStructuralPackageOrderTrayServiceImpl extends ServiceImpl getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo) { + return baseMapper.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapMapper.xml new file mode 100644 index 00000000..ad92a017 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml new file mode 100644 index 00000000..77588d51 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml index 30430260..c4676b1c 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml @@ -82,4 +82,11 @@ inner join wms_structural_package_order_tray ot on o.id=ot.order_id where ot.no=#{no} + + diff --git a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java index fe321edb..c7d5191a 100644 --- a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java +++ b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java @@ -33,7 +33,7 @@ public class CodeGeneratorTest { ) .strategyConfig(builder -> { builder - .addInclude("wms_srm_order_item") //只生成指定表 + .addInclude("wms_structural_package_deliver_order_map") //只生成指定表 .entityBuilder().idType(IdType.ASSIGN_ID) .enableLombok() .enableChainModel()