From fbde7268ef81e419289298942c469b51f14c66b9 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 10 May 2023 11:03:23 +0800 Subject: [PATCH] =?UTF-8?q?add:=E8=BD=BD=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/MdPbBagrecordController.java | 21 ++ .../MdPbBucketchangeflowController.java | 21 ++ .../vehicle/MdPbBucketrecordController.java | 21 ++ .../MdPbStoragevehicleextController.java | 21 ++ .../MdPbStoragevehicleinfoController.java | 21 ++ .../MdPbStoragevehiclepointController.java | 21 ++ .../vehicle/IMdPbBagrecordService.java | 16 ++ .../vehicle/IMdPbBucketchangeflowService.java | 16 ++ .../vehicle/IMdPbBucketrecordService.java | 16 ++ .../IMdPbStoragevehicleextService.java | 16 ++ .../IMdPbStoragevehicleinfoService.java | 16 ++ .../IMdPbStoragevehiclepointService.java | 16 ++ .../service/vehicle/dao/MdPbBagrecord.java | 130 ++++++++++++ .../vehicle/dao/MdPbBucketchangeflow.java | 95 +++++++++ .../service/vehicle/dao/MdPbBucketrecord.java | 195 ++++++++++++++++++ .../vehicle/dao/MdPbStoragevehicleext.java | 111 ++++++++++ .../vehicle/dao/MdPbStoragevehicleinfo.java | 131 ++++++++++++ .../vehicle/dao/MdPbStoragevehiclepoint.java | 79 +++++++ .../dao/mapper/MdPbBagrecordMapper.java | 16 ++ .../mapper/MdPbBucketchangeflowMapper.java | 16 ++ .../dao/mapper/MdPbBucketrecordMapper.java | 16 ++ .../mapper/MdPbStoragevehicleextMapper.java | 16 ++ .../mapper/MdPbStoragevehicleinfoMapper.java | 16 ++ .../mapper/MdPbStoragevehiclepointMapper.java | 16 ++ .../dao/mapper/xml/MdPbBagrecordMapper.xml | 5 + .../mapper/xml/MdPbBucketchangeflowMapper.xml | 5 + .../dao/mapper/xml/MdPbBucketrecordMapper.xml | 5 + .../xml/MdPbStoragevehicleextMapper.xml | 5 + .../xml/MdPbStoragevehicleinfoMapper.xml | 5 + .../xml/MdPbStoragevehiclepointMapper.xml | 5 + .../impl/MdPbBagrecordServiceImpl.java | 20 ++ .../impl/MdPbBucketchangeflowServiceImpl.java | 20 ++ .../impl/MdPbBucketrecordServiceImpl.java | 20 ++ .../MdPbStoragevehicleextServiceImpl.java | 20 ++ .../MdPbStoragevehicleinfoServiceImpl.java | 20 ++ .../MdPbStoragevehiclepointServiceImpl.java | 20 ++ .../impl/ProduceWorkorderServiceImpl.java | 2 +- .../impl/ProduceshiftorderServiceImpl.java | 2 +- .../pda/rest/PdaProductIosController.java | 4 +- .../impl/DeliveryOrderServiceImpl.java | 2 +- .../service/impl/SaleOrderServiceImpl.java | 2 +- .../PdmBiWorkprocedureController.java | 5 +- .../sch/service/impl/PointServiceImpl.java | 2 +- .../sch/service/impl/TaskServiceImpl.java | 2 +- .../sch/tasks/CallMaterialTask.java | 4 +- .../sch/tasks/SendMaterialTask.java | 4 +- .../impl/PdmProduceWorkorderServiceImpl.java | 4 +- .../dao/mapper/StIvtIostorinvBcpMapper.java | 1 + .../product/impl/ProductInServiceImpl.java | 6 +- .../impl/SemiProductInServiceImpl.java | 4 +- .../java/org/nl/wms/storage_manage/stivt.xls | Bin 400896 -> 409088 bytes 51 files changed, 1230 insertions(+), 23 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBagrecordService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketchangeflowService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleextService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehiclepointService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBagrecord.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketchangeflow.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehiclepoint.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBagrecordMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketchangeflowMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketrecordMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleextMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehiclepointMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBagrecordMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketchangeflowMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleextMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehiclepointMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBagrecordServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketchangeflowServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleextServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehiclepointServiceImpl.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java new file mode 100644 index 00000000..2cb8ec49 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBagrecordController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.controller.vehicle; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 袋记录表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@RequestMapping("/mdPbBagrecord") +public class MdPbBagrecordController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java new file mode 100644 index 00000000..2c388a1b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketchangeflowController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.controller.vehicle; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 桶物料变动记录表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@RequestMapping("/mdPbBucketchangeflow") +public class MdPbBucketchangeflowController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java new file mode 100644 index 00000000..da15263f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.controller.vehicle; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 桶记录表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@RequestMapping("/mdPbBucketrecord") +public class MdPbBucketrecordController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java new file mode 100644 index 00000000..ccb34354 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleextController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.controller.vehicle; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 载具扩展属性信息表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@RequestMapping("/mdPbStoragevehicleext") +public class MdPbStoragevehicleextController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java new file mode 100644 index 00000000..ad545c0a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.controller.vehicle; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 载具信息表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@RequestMapping("/mdPbStoragevehicleinfo") +public class MdPbStoragevehicleinfoController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java new file mode 100644 index 00000000..3c8aade0 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehiclepointController.java @@ -0,0 +1,21 @@ +package org.nl.wms.masterdata_manage.controller.vehicle; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 载具点位对应表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@RestController +@RequestMapping("/mdPbStoragevehiclepoint") +public class MdPbStoragevehiclepointController { + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBagrecordService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBagrecordService.java new file mode 100644 index 00000000..6a181584 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBagrecordService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBagrecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 袋记录表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IMdPbBagrecordService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketchangeflowService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketchangeflowService.java new file mode 100644 index 00000000..0b979c90 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketchangeflowService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketchangeflow; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 桶物料变动记录表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IMdPbBucketchangeflowService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java new file mode 100644 index 00000000..43b46fa9 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 桶记录表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IMdPbBucketrecordService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleextService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleextService.java new file mode 100644 index 00000000..4cb81301 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleextService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 载具扩展属性信息表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IMdPbStoragevehicleextService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java new file mode 100644 index 00000000..ab31b342 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 载具信息表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IMdPbStoragevehicleinfoService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehiclepointService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehiclepointService.java new file mode 100644 index 00000000..3ec61d78 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehiclepointService.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehiclepoint; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 载具点位对应表 服务类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IMdPbStoragevehiclepointService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBagrecord.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBagrecord.java new file mode 100644 index 00000000..8f29ea7b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBagrecord.java @@ -0,0 +1,130 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 袋记录表 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_bagrecord") +public class MdPbBagrecord implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 袋记录标识 + */ + private Long bagrecord_id; + + /** + * 袋唯一标识 + */ + private String bag_id; + + /** + * 物料标识 + */ + private Long material_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 数量计量单位标识 + */ + private Long qty_unit_id; + + /** + * 数量计量单位名称 + */ + private String qty_unit_name; + + /** + * 数量 + */ + private BigDecimal storage_qty; + + /** + * 顺序号 + */ + private BigDecimal seqno; + + /** + * 备注 + */ + private String remark; + + /** + * 软废类型 + */ + private String waste_type; + + /** + * 还回人员 + */ + private String return_person; + + /** + * 打印次数 + */ + private BigDecimal print_times; + + /** + * 状态 + */ + private String status; + + /** + * 创建人 + */ + private Long input_optid; + + /** + * 创建人姓名 + */ + private String input_optname; + + /** + * 创建时间 + */ + private String input_time; + + /** + * 桶唯一标识 + */ + private String bucketunique; + + /** + * 组桶人 + */ + private Long makeup_optid; + + /** + * 组桶人姓名 + */ + private String makeup_optname; + + /** + * 组桶时间 + */ + private String makeup_time; + + /** + * 打印模版 + */ + private String print_type; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketchangeflow.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketchangeflow.java new file mode 100644 index 00000000..f30416c9 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketchangeflow.java @@ -0,0 +1,95 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 桶物料变动记录表 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_bucketchangeflow") +public class MdPbBucketchangeflow implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 记录标识 + */ + private Long change_id; + + /** + * 桶唯一标识 + */ + private String bucket_code; + + /** + * 物料标识 + */ + private Long material_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 库存等级 + */ + private String ivt_level; + + /** + * 是否可用 + */ + private String is_active; + + /** + * 品质类型 + */ + private String quality_scode; + + /** + * 变动类型 + */ + private String change_type_scode; + + /** + * 变动时间 + */ + private String change_time; + + /** + * 记录员 + */ + private Long rec_person; + + /** + * 变动数量 + */ + private BigDecimal change_qty; + + /** + * 结存数量 + */ + private BigDecimal result_qty; + + /** + * 数量计量单位标识 + */ + private Long qty_unit_id; + + /** + * 数量计量单位名称 + */ + private String qty_unit_name; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java new file mode 100644 index 00000000..edee1353 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java @@ -0,0 +1,195 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 桶记录表 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_bucketrecord") +public class MdPbBucketrecord implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 桶记录标识 + */ + private Long bucket_record_id; + + /** + * 桶唯一标识 + */ + private String bucketunique; + + /** + * 桶类型 + */ + private String storagevehicle_type; + + /** + * 物料标识 + */ + private Long material_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 库存等级 + */ + private String ivt_level; + + /** + * 是否可用 + */ + private String is_active; + + /** + * 品质类型 + */ + private String quality_scode; + + /** + * 数量计量单位标识 + */ + private Long qty_unit_id; + + /** + * 数量计量单位名称 + */ + private String qty_unit_name; + + /** + * 数量 + */ + private BigDecimal storage_qty; + + /** + * 顺序号 + */ + private BigDecimal record_order; + + /** + * 袋数 + */ + private BigDecimal bag_qty; + + /** + * 备注 + */ + private String remark; + + /** + * 打印次数 + */ + private BigDecimal print_times; + + /** + * 状态 + */ + private String status; + + /** + * 创建人 + */ + private Long create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 存储载具标识 + */ + private Long storagevehicle_id; + + /** + * 存储载具编码 + */ + private String storagevehicle_code; + + /** + * 组盘人 + */ + private Long makeup_optid; + + /** + * 组盘人姓名 + */ + private String makeup_optname; + + /** + * 组盘时间 + */ + private String makeup_time; + + /** + * 入库人 + */ + private Long instor_optid; + + /** + * 入库人姓名 + */ + private String instor_optname; + + /** + * 入库时间 + */ + private String instor_time; + + /** + * 出库人 + */ + private Long outstor_optid; + + /** + * 出库人姓名 + */ + private String outstor_optname; + + /** + * 出库时间 + */ + private String outstor_time; + + /** + * 入立库人 + */ + private Long instor_optid2; + + /** + * 入立库人姓名 + */ + private String instor_optname2; + + /** + * 入立库时间 + */ + private String instor_time2; + + /** + * 打印模版 + */ + private String print_type; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java new file mode 100644 index 00000000..fdc816a6 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java @@ -0,0 +1,111 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 载具扩展属性信息表 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_storagevehicleext") +public class MdPbStoragevehicleext implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 载具扩展标识 + */ + private String storagevehicleext_id; + + /** + * 载具标识 + */ + private String storagevehicle_id; + + /** + * 载具编码 + */ + private String storagevehicle_code; + + /** + * 载具类型 + */ + private String storagevehicle_type; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 数量计量单位标识 + */ + private String qty_unit_id; + + /** + * 数量计量单位名称 + */ + private String qty_unit_name; + + /** + * 数量 + */ + private BigDecimal storage_qty; + + /** + * 工艺指令卡 + */ + private String workordercard_id; + + /** + * 配方标识 + */ + private String formula_id; + + /** + * 是否需清洗 + */ + private Boolean is_need_clean; + + /** + * 备注 + */ + private String remark; + + /** + * 修改人 + */ + private String update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private Date update_time; + + /** + * 设备标识 + */ + private String device_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java new file mode 100644 index 00000000..51d5af68 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleinfo.java @@ -0,0 +1,131 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 载具信息表 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_storagevehicleinfo") +public class MdPbStoragevehicleinfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 载具标识 + */ + private String storagevehicle_id; + + /** + * 载具编码 + */ + private String storagevehicle_code; + + /** + * 载具名称 + */ + private String storagevehicle_name; + + /** + * 一维码 + */ + private String one_code; + + /** + * 二维码 + */ + private String two_code; + + /** + * RFID编码 + */ + private String rfid_code; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private Date create_time; + + /** + * 修改人 + */ + private String update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private Date update_time; + + /** + * 是否删除 + */ + private Boolean is_delete; + + /** + * 是否启用 + */ + private Boolean is_used; + + /** + * 载具类型 + */ + private String storagevehicle_type; + + /** + * 载具宽度 + */ + private BigDecimal vehicle_width; + + /** + * 载具长度 + */ + private BigDecimal vehicle_long; + + /** + * 载具高度 + */ + private BigDecimal vehicle_height; + + /** + * 载具是否超仓位 + */ + private String overstruct_type; + + /** + * 占仓位数 + */ + private BigDecimal occupystruct_qty; + + /** + * 外部标识 + */ + private String ext_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehiclepoint.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehiclepoint.java new file mode 100644 index 00000000..8003a0f8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehiclepoint.java @@ -0,0 +1,79 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 载具点位对应表 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_storagevehiclepoint") +public class MdPbStoragevehiclepoint implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 载具点位对应标识 + */ + private Long storagevehiclepoint_id; + + /** + * 对应类型 + */ + private String set_type; + + /** + * 载具标识 + */ + private Long storagevehicle_id; + + /** + * 载具编码 + */ + private String storagevehicle_code; + + /** + * 点位标识 + */ + private Long point_id; + + /** + * 点位编码 + */ + private String point_code; + + /** + * 点位名称 + */ + private String point_name; + + /** + * 所属区域 + */ + private String area_type; + + /** + * 修改人 + */ + private Long update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBagrecordMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBagrecordMapper.java new file mode 100644 index 00000000..5f420913 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBagrecordMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBagrecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 袋记录表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface MdPbBagrecordMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketchangeflowMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketchangeflowMapper.java new file mode 100644 index 00000000..fab8e79a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketchangeflowMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketchangeflow; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 桶物料变动记录表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface MdPbBucketchangeflowMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketrecordMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketrecordMapper.java new file mode 100644 index 00000000..efc50b45 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketrecordMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 桶记录表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface MdPbBucketrecordMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleextMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleextMapper.java new file mode 100644 index 00000000..c8a34c7e --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleextMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 载具扩展属性信息表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface MdPbStoragevehicleextMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java new file mode 100644 index 00000000..e7449ea7 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehicleinfoMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 载具信息表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface MdPbStoragevehicleinfoMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehiclepointMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehiclepointMapper.java new file mode 100644 index 00000000..897375b6 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbStoragevehiclepointMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehiclepoint; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 载具点位对应表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-05-10 + */ +public interface MdPbStoragevehiclepointMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBagrecordMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBagrecordMapper.xml new file mode 100644 index 00000000..0be90d56 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBagrecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketchangeflowMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketchangeflowMapper.xml new file mode 100644 index 00000000..1e38422c --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketchangeflowMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml new file mode 100644 index 00000000..7f056a2a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleextMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleextMapper.xml new file mode 100644 index 00000000..c0cae7e5 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleextMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml new file mode 100644 index 00000000..4785cf38 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehicleinfoMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehiclepointMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehiclepointMapper.xml new file mode 100644 index 00000000..135720a2 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbStoragevehiclepointMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBagrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBagrecordServiceImpl.java new file mode 100644 index 00000000..cf846652 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBagrecordServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.service.vehicle.impl; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBagrecord; +import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbBagrecordMapper; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBagrecordService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 袋记录表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class MdPbBagrecordServiceImpl extends ServiceImpl implements IMdPbBagrecordService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketchangeflowServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketchangeflowServiceImpl.java new file mode 100644 index 00000000..0738e2c7 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketchangeflowServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.service.vehicle.impl; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketchangeflow; +import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbBucketchangeflowMapper; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketchangeflowService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 桶物料变动记录表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class MdPbBucketchangeflowServiceImpl extends ServiceImpl implements IMdPbBucketchangeflowService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java new file mode 100644 index 00000000..febe568c --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.service.vehicle.impl; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; +import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbBucketrecordMapper; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 桶记录表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class MdPbBucketrecordServiceImpl extends ServiceImpl implements IMdPbBucketrecordService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleextServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleextServiceImpl.java new file mode 100644 index 00000000..00c118e0 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleextServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.service.vehicle.impl; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; +import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbStoragevehicleextMapper; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 载具扩展属性信息表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class MdPbStoragevehicleextServiceImpl extends ServiceImpl implements IMdPbStoragevehicleextService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java new file mode 100644 index 00000000..a1b3d863 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.service.vehicle.impl; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; +import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbStoragevehicleinfoMapper; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 载具信息表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl implements IMdPbStoragevehicleinfoService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehiclepointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehiclepointServiceImpl.java new file mode 100644 index 00000000..ee04489e --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehiclepointServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.masterdata_manage.service.vehicle.impl; + +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehiclepoint; +import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbStoragevehiclepointMapper; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehiclepointService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 载具点位对应表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class MdPbStoragevehiclepointServiceImpl extends ServiceImpl implements IMdPbStoragevehiclepointService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java index ed2fb2c1..e207000f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java @@ -27,7 +27,7 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.system_manage.service.user.ISysUserService; import org.nl.wms.system_manage.service.user.dao.SysUser; -import org.nl.wms.masterdata_manage.master.service.ClassstandardService; +import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.common.enums.WorkerOrderEnum; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.mps.service.ProduceWorkorderService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java index 7bd44c8d..578c489d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java @@ -30,7 +30,7 @@ import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.system_manage.service.user.ISysUserService; import org.nl.wms.system_manage.service.user.dao.SysUser; import org.nl.wms.system_manage.service.user.dto.CurrentUser; -import org.nl.wms.masterdata_manage.master.service.ClassstandardService; +import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.mps.service.ProduceshiftorderService; import org.nl.wms.mps.service.WorkOrderImportEnum; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java index 1e963a32..f8865a28 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java @@ -11,8 +11,8 @@ import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.ConstantParam; import org.nl.common.anno.Log; import org.nl.common.utils.MapOf; -import org.nl.wms.masterdata_manage.st.service.SectattrService; -import org.nl.wms.masterdata_manage.st.service.StructivtService; +import org.nl.wms.masterdata_manage.备份st.service.SectattrService; +import org.nl.wms.masterdata_manage.备份st.service.StructivtService; import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService; import org.nl.wms.product_manage.sch.service.PointService; import org.nl.wms.storage_manage.service.product.ProductInService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java index f8cdb2cb..a4f8a64f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java @@ -18,7 +18,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.master.service.ClassstandardService; +import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.procure_manage.备份pcs.service.DeliveryOrderService; import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java index bcad19b0..0ba44236 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java @@ -18,7 +18,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.master.service.ClassstandardService; +import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService; import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java index 4362c092..fff30c06 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java @@ -6,10 +6,9 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; -import org.nl.wms.masterdata_manage.pdm.service.WorkProcedureService; -import org.nl.wms.masterdata_manage.pdm.service.dto.WorkProcedureDto; +import org.nl.wms.masterdata_manage.备份pdm.service.WorkProcedureService; +import org.nl.wms.masterdata_manage.备份pdm.service.dto.WorkProcedureDto; import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; -import org.nl.wms.product_manage.service.workprocedure.impl.PdmBiWorkprocedureServiceImpl; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java index 36392c5b..17fe80a6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java @@ -21,7 +21,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.st.service.StructivtService; +import org.nl.wms.masterdata_manage.备份st.service.StructivtService; import org.nl.wms.product_manage.sch.service.PointService; import org.nl.wms.product_manage.sch.service.RegionService; import org.nl.wms.product_manage.sch.service.dto.PointDto; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java index cbc997f1..73754f30 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java @@ -15,7 +15,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.master.service.ClassstandardService; +import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/CallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/CallMaterialTask.java index 62169998..244b903b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/CallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/CallMaterialTask.java @@ -11,8 +11,8 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.masterdata_manage.st.IvtChangeTypeEnum; -import org.nl.wms.masterdata_manage.st.StoreIvtServiceImpl; +import org.nl.wms.masterdata_manage.备份st.IvtChangeTypeEnum; +import org.nl.wms.masterdata_manage.备份st.StoreIvtServiceImpl; import org.nl.common.StructFindUtil; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SendMaterialTask.java index 858456e9..f23ce340 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SendMaterialTask.java @@ -13,8 +13,8 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.masterdata_manage.st.IvtChangeTypeEnum; -import org.nl.wms.masterdata_manage.st.StoreIvtServiceImpl; +import org.nl.wms.masterdata_manage.备份st.IvtChangeTypeEnum; +import org.nl.wms.masterdata_manage.备份st.StoreIvtServiceImpl; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/PdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/PdmProduceWorkorderServiceImpl.java index c5abee26..5352bcde 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/PdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/PdmProduceWorkorderServiceImpl.java @@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; -import org.apache.tools.ant.taskdefs.condition.Http; import org.jetbrains.annotations.NotNull; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -25,13 +24,12 @@ import org.nl.common.utils.OptionRecord; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.api.CommonResult; import org.nl.common.utils.api.RestBusinessTemplate; -import org.nl.common.utils.api.ResultCode; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.masterdata_manage.master.service.ClassstandardService; +import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.mps.service.WorkOrderImportEnum; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java index 017d3ce3..96bafb03 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author generator * @since 2023-05-10 */ + public interface StIvtIostorinvBcpMapper extends BaseMapper { } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/product/impl/ProductInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/product/impl/ProductInServiceImpl.java index d1e6a278..f07f0814 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/product/impl/ProductInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/product/impl/ProductInServiceImpl.java @@ -23,9 +23,9 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl; -import org.nl.wms.masterdata_manage.st.service.StorattrService; -import org.nl.wms.masterdata_manage.st.service.StructattrService; -import org.nl.wms.masterdata_manage.st.service.dto.StructattrDto; +import org.nl.wms.masterdata_manage.备份st.service.StorattrService; +import org.nl.wms.masterdata_manage.备份st.service.StructattrService; +import org.nl.wms.masterdata_manage.备份st.service.dto.StructattrDto; import org.nl.wms.product_manage.sch.service.PointService; import org.nl.wms.product_manage.sch.service.dto.PointDto; import org.nl.wms.product_manage.sch.tasks.ProductInTask; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/semiproduct/impl/SemiProductInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/semiproduct/impl/SemiProductInServiceImpl.java index 85ffb212..558e9a35 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/semiproduct/impl/SemiProductInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/service/semiproduct/impl/SemiProductInServiceImpl.java @@ -23,8 +23,8 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl; -import org.nl.wms.masterdata_manage.st.service.StructattrService; -import org.nl.wms.masterdata_manage.st.service.dto.StructattrDto; +import org.nl.wms.masterdata_manage.备份st.service.StructattrService; +import org.nl.wms.masterdata_manage.备份st.service.dto.StructattrDto; import org.nl.wms.product_manage.sch.service.PointService; import org.nl.wms.product_manage.sch.service.dto.PointDto; import org.nl.wms.product_manage.sch.tasks.SemiProductInTask; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls index 8ea30294fe45f9bd2cd00dd6438b5620cef9ed22..63539ccdf2a60b8bf6a1c6e32e862d16b0bb8a6e 100644 GIT binary patch delta 26264 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 delta 21224 zcmb_^2|yG__IFiZ1H&=HDJaT-2Po%oYfuLU1QZnoCB_3e1|xVij-5GuzA-G?-jfeT{1%|ElHdOTju#N(8$eVH)Exi)amtmOGW z;MGuGGgh3*&1EiSi}l<rN=u_}c&2ek9hQpc{G{b|Rf_Huj?(h`6J%yls#67KnNLf&4U}FP~h1&8f z3bn<%8ET`z)NKolPiY`Z#skG0p(}7#F)PF%9t_jrPNHLYXVE3x%a+VAoQV)fVd_itWzM8TFX@Xzg>)p=n~lI{XsI^ z-6m{}i;L2T(s&oKTV$BE?SS=@YqiC-Pr-XX1qYA#V~22UHaDW>3W4H<$S^TK+SRJK zauBGG5%9&ixR?wk17Z}*D!BbqaP3oY;IC5U2=;P&!LoeswzxnG*pA}Ns8DfYv|EtU zAUHrP0SXQcHsRu-2_3A8_#k8i^&zIswl!<(7RCJ#if`F1MIGR8k|wLE$Z=^Vr@4HP z(eZ3yQif0LtpwYBiQ}ao>x-jB*iulAYW@%T|MA6dik4 zT8(n;w#HEKwnIyC%tDu1OOtV!i0$Gq2<_tDBGV@U2X0O3GXZ0xxbc}4@Eac=W|YU6 zZAWS9p%icBK}KC(!haYQs4KCO2|mgtclmLfn{? zBPgZf-dxWR*%4ba*&MXBZemt)4vyHmEqN%$K_ZtDhJ&_7rD(9?en`yC^%S#HkGm=Z z2$8W-uy}K17jFv7Hfn^Gh!ZN7r-g~;G%s%&QrqJQ5|5{a;V_XK7^YFAbQHCDJwb_r zfnfrjjCUB(rMH*3WndW%DH8={!Bngd#;md#vk8ags9jthm3H}?M-^3$xPDN39@f;# z9R~ch(Zg)D9u2B=Q?zcbo4wdCx3l<8da8G$*R<9{+?DPvb{_2M-8KN(WTy`f1IL&> zmp5u}M_)|ayMaH;ADdNW942BbyfGNHi-W_qi??+S zb)t)jSqb2rubf?|=)ald-qUxvcLwmMfF*V}L13kriS+VLAhq4T{Pl9qY3wwzX z@2Sf#lr~NwrBn%_(0nVmhrPte6%aqYAb{*28KwqouuLnyP|-2_Jy>bBWv@tUGkw*K zgfg{SXx-@Bm~FNZvw4@e?AaV6^;LOEYU-<8OTnS7*0|_1s#%~jsaCLUX2gO~DQ!b# zV~hJoh2aSC-l!DSQsDD8OW7pYmcnv1K-h3`@^dr@t$$9L#VvxQO+F~oB1oz@>;j)l zfp(Kd(;eYo;Wt#|#?XMAKIT36y*DNdf?E3E&f?Wn2RqwJCT5ML4K5fPrmhZP!dAl) zBpw`FDJTOX;&Gm0&bVdjZWG4Py|rz)oD|i6V2ZZh28snxs(5a*F;wRhEFd{l$9p-n z2U+83uwOqu%o+|&$fMWFv%_U88W3_+bx)%_2c#d91}{LjvT@qa0~k>8aQU>=4*; zxoO00i*OtJU>6f=ihGK7u*}6F7`oQDw>UrV<6MOYireL(Iz$duCov%DtB zYi*-HDVrZTdZOmHy$Vk4gpsVMa@(ec2L*3_Zldth4!5__RScnr+0v?ErJ%WkHwkK5 zgTZ!c!*T=k2%#N0n67Z`;Z1~+cny*E{nr(aVi#N8Qi%3s(8Lbc}NB4(D2 z7ahumZ~a$UC>GtK+{K1z?p(vvtWt6DtWa_MV!c>0D_Bf~7ePi2k!@i;?HB%1z?uvrJ;o@?cSztw_CC87{std!;DMoh^pW(TnFm+kSI`#Sy?W zzbaU~Q{f}`a0%efswN97Oycu%e8kN!>c#ue=JVCFMSH-gKJ}_Tr>cVC6rT3)W6<`|W`B`WO>qo&D z#+<=;OdeSX^X}7Vdd=Y%E%_7gEp;xW*xh~#HpNnsKWp~VY>GK#D%klUxXSN&iaDd- zM^cQ%6Bql>@yMZEv-1?LV?)Go_1UJXg~$`R?V*?ki{qXh{g!T)P#%Kb%zV{Ci#A>s zb*H`h47D)8VW)7&3Qlws(_TJ@%IK3X4Q^sl zD!U{16!DeQ10(lhJG2*+SRTcoLc1Z5fM5MENQY2eoO~tJLA*g2mLf*X{5ize&5o8i z$lO9*9khb$Fq#8A5GaxT);E6+!YDsCq_T!>kHE{XphI-a;S?VJ_c(I*d&8yXtO zk&pR6p#iQC7W-f5>TRo}u~k;7y(nJj%_Qiy9=dRu#V>5#amB-ceWinTII0u56oH+I zb08kHwi_4C>$X;dH{%&|TQlj~+2r%yxp_t|IWW{<8K7LP7jwd;B zSRfCA@l{P1gg?)Flt-+Q*pvJt3HwWDL$HKdUl6c735V*FP&t~6a!?{N!<~yuxU?<| z-(YY@@~8_ACCf!j=E_!NlYsLT2!WuHPVZ80e=!C%{^oc?h}i$&36y*X z4Z6T!pFn66(17oO6_$`SKuvB4#e&h#16=|18Q7m+1^Nom0Y4yg7bt%Up)K$**SZ%n z#h&mm_(z1k1X>Q%&;g+ZKf%u33mP~L4FJsr>IAz6^Uny~2D%^U6j&y5~#)zwkZveSpla1{SHD)!Q?aU!VCtJPx%G30L|EY z2#G+C0?pMU6b;&a2J|w}N-+K5U!hlE`bocm44{{QP6yMEc!1DFpuHa=^c9$#tB2tM zlP?1536^&M9ihKkA=Bv*LLY$17X$SIQzt$~=v$!2ffj(Nzkq3-4JPglQQ|A08-d1y zX|pj#mw`S8x*SZr6PDgoF!5hmjH1BA`*@7PA+T^7jHZGG4R*i>7TgK6J6O(akCAmV zWKKZF3?|IeVssejLxgAxG`O5R4ueG1?YIRxQWtN&0-Om$F9URT}bmEY9fQhx`zOc+?fXly-+N zP-0k)JCOWwI7v7f18T%K*6s!ocj|l`EB!48#|YlFFuHnVR|oxrdf@2m=xDQbUlP+Q zCRj2QViuDP%W#-84}4G#Z9q;>DktK(T1OK`7lvR|IJ}vBBRP8m_m&T5&gB4;m|;W{68A z>&~2F$cbuvMCinVnE|H#~~P@IAxWzP03sg?JV|OGYfh znfM&}$09rw$iqe045aUiGMT54&nP)h>=y&MKn5?yUGYUSRUxk^ItIq$#9WA*(34M7C3Mf&8F=j}_v#L@rCFf|2v<@XY!{jE?`S z#XxL&8E1|r8FMg4Osg4ZXJZXU3CFHf2{I< z{0ICy<}vH^y5d3xjh(@uhNTQTwv3VdZs1roFPdAA)3dE3=-!dM=dYUb#$K8-(cqGE~wxT z0GFYQWYJCFyrhCdWzNf_o`P3YFhd5fl9F3Y@w?X;#&$#ZSV%!{KMtiH%ZBD#)5B=pd8XyQJzA z+nr3f&#cq^qKe3oMck8|e`S(c-F+1uFSqt989xj}R6b-fbib)3xibF)a^fNA@lXZx zWU!tLtOq0fu7dfpj7Q`|J#ao&!2+4{2^si1W6?LLpasAcuXU+ovMX; zTD9K3Kd6^#WHnCMLCWaI{>bVap%%5!S+LL$>?HL`WG`c_vn_X~O**Q8_6}&BjZe&p!Ytgx@V4Vzlkoq)s8cfNO zfh?Vp^#j?#OyiXN4R{9OpQMq4*}pK3p0XbPpdsuZa0cr|JTlliT?bWQ127N4UXuGT z*4We)gypV~tSt6)eq=W8#rzANF#IJl(uEFIy!Uqk7j2y&Jev^c#ouy0Wr1-;v$Rrm7E*{ zVr+B6Rpxv^(#Ha5n;UL2SWjxkLUr5RaF?q;BI)CR(>6CeWX>m~20-xl9y#n->@6+G zVPAy%M9DFa_2qFVDR=_whIKxwHM>EbA-FRcGLbFPby30Y01m>w%!@;pf;kk^pF;csKtM{UE0O|VuvH8A)m1h433hX`-1H*Kz&&GW${UW5HkM$ z4O?LcgV^N+n`saAV$^#1|G6G{?F@TU7YocZ!qCXP1jR{fYuTZ8_Pu2huBd`!q`}sYnsz)pwTG2{#U^E{wLqp<%%97VG&+2_ z^KP>Fon}Fn9ze|oItS8RNLEPI43bXOv3og)!t3v|rCJ=n-I2R!Z?921_rAQ=OFAug z3ETHo!G99H8|NXpIdX4sj{Vf0(G6fz&(7$%3!27tW}mW?IqSu}tik=IDF*Jo4x6OH zaPBOpO8^1XPBA2Wirh@eVcEiKT!9>oY%T&SNWiX4F%m9v1!ACMU zl58_`KQzwACjj<<`M5p_)DD&|BynzxE?ccZmxmtsSt6uB;V5ZH3ik!4drmE+t3(ex znsiHt!ZFh1blTyu(upBlCfzUg%HUG$A!tB%IwFqzJcR2^NCxMRPmxbDxW~G2su&vX zJL4Sk`7rKl$N4h9KhnZ!1$k>Y=Sc=nU>(Vx;oPOhh1L-&(1mteCU+TQXKDQij?kqw zY82PdIOJYrb2;ZhhCK)7v#qnug6EbXz+b3}stpJIR;_DId+zW%kNw z4whL`lLvd1m&R~UxW={C9~kLcyEd1DwRXI!d>~a`UTa4ba7}A%FJOkXmSkDDqQ=ey z$)FQCXyH!lZQIxo0AZ1``;xLkCVA-*MS50W{N8`-!H8)d22$ z!-*b*17{35&8y(Uz3eZd=a2)LP{|Er*Q52M_$}6l9IoV&G`&(`=@`k;TS0p)b)CVL zGdNdTH;aRHJx_H}21JZT`Q($?+&)|&&7A{ofi2|jT=0uRGS><-e1ghqC$ml@yRFdM zA{Dfk!RJXtHGq>;P%DFz$-5LRRzU|DEFm4|ai8K+a$+8co}!jHLD_gTm3YpF`Bp~8 z&4;pSYMHZKR!-iaWfkPoe9&wDd>#g_tl)xcT&?8b0)dALClGY6+JH6XnMx+)yAvOSv=-?#vs=%B5VD6J=_EBTf1_ zBj)Ydm$`GeMT;hKbR}m7 z*PwDS*|QNkRkNNO|FpJluHy2s5z`$s9O|N{HU;JMLl5JsjvqWjw)DV<*RJ8p`CvfG z$&5AJKye>u5?Z%8n3L$Qu}M>FpuAMWFlyI0#ay}zX9;p`nYFbW?Z1 zzMEyRR3Uq0BI&k(Fpvh+PkQhXx4ZG;abtGu=jKI@w86NO0{NFg z_qkNHpf$eoDL8dW`WXv#4OsgAH*O;yJ7LUQR`5=E6j3~F+SJL&06Tmh?l@?xaNmIq zu*1iABV27n`DisNA6aCnTtrcdb%Xl_2F{$b70sNkqpOe~?+J~Gk!!iWd zbKOV7GatE~8O__thI+`@I3FpNGhTlQfujagnV;S#Bqfl~`IVw5| zfF3roGj9<#Mo06N4O9tdlp2k=l7Msf~x#hWB-emVK z8D*9NOKSdPYc3Mf3eb@(uB^h*lw38XbedqnomPfsS&FAjM!DsdBuiP*bnM}3u9#L{ zT3p1;T#}enRBXr^g))+Jk`f~VjVL@k*bvdvkg#}~ArpO6GC?coOhbn!nA4MA)ep|d z%p8{9Q9r7KJ`<%TCugM%NlHe~=42%#rYC3Wtyu}fv*wx8O3IOCf~Cw5aNsf8eR|8y z9e@A!BHF(H^ST4OzTIm0;vb)U1`jg>cG^AMeR`f|&$*h~@FU-R^37f*fswYGK0W#U zi5-WqlUB$u4KSq|22_;fqw=EC62k;bIg?afkTqk9C9q&wUU@bCqHnOFpjz1SHP=&X zfE6Am71{MzF7O3|95fEoN+*5e@EM~i!a`p|ILsN0(h3d!1$hzv`)aIQx2%bllKH~C zF7`E&p{Pa(H)NIWH1zKMIlosh`}TdYtga~75N-~hr`d~49r`ER3$X_}@LIb8rcVBb zEB=Na2Rw{ld(3m%A0ZeIbi+b&RgtwE4y8i1LUKugA+2!UB5sJKs@zbth;?F^WOQVn zxwI@d|IuX2+@!x|zv=&$=}mu=fB!}PDGm+(e*XEW!QWtb;fnufesbK{<9GX!xogFn zesB6s+52i>QV)j@t$tR&@}xq)8CE~TT+5Te^H)=(#IL&prKJ^Czks3*mhMXoy`DWd z!{2&-607l>%DSE(RqI>eQqb2B!x;kd^S2$_ekuliyLHd|2X<+-d%D^k%^oqLfxW}7 zj7q4@L(?tUrDc;qo6)7&Xfkizx zgqGwMTMTSKjn6H^82&u^h!2fg?!!#e#O88$aknl38?0ToI~EychZywF8nCe=8p$PT z*-D=nt$(p)T0tJ;{~<0m_-7{#dS?Zm;^aTvJOu{~@cZTqZrBRETJN7a52pybBLmp{ z%qn3g-muueuDkxg$H(>^?Y{TOmZY2737(ndGls7zWQtd#q_WZ}Nu{RBlJuf!Hdt&>#178>tFx&ma_CStFtm#x>E}dLaTwijhTpQ%O{r!6;Tyf6UqcB6jUH?ls zVr1wwJRL{Q#sRJyEngYd8v@+|f($DMPd8;)cO5%^av{-v9p5*~5V_jhkh%V?SHFH} zIDYEL5$)8zeGQ&b$MFOdu(watks~kuyU(hAtNLiOCl;;rb+8)i;sQHrdWM=U8IvbZ z3#{dXP1;a2GIw%?#Sq``kpZ5AW(dNE8~CZKO@_-kd=5W~kLa1n`xGsw52 zN5|+rd)$wG9>!a>R_#=6R49LDr~6Q?W$YR66W)=&JTv!pe=YqQwK3lONA8O26SO5LvCl;Vdf7Pbq7X1!8^HYSz^o$! zi&1V#L1IODc_}I}=9niJx!ky*SK%+A6oQ3 z-I*5G{E7C-(f?WdA)oz;_J7=`wlDR-X?X3I;F0eu&h{nv-7d&hkcVILLpgX?NcGD@ zGC1Qa0AY`;fI=+={}*og^`Gd(W|&0(qe0wsohH&DU^n z94+XrvOWVe9#UUO^kryTW&)Z3DG`zx65L@bV%@Lf)F{e9({q51hBOA!SV-d_QiEgXm^oNuaI*RfR=6-E>IZa$X zWl%!cr{9;`@T)?)Us6cIfd!xZ`}J3>r~hWd8*=|*xIWZ8p7hLm;(hY%!#2F)%OSsJ z1q}Fp&rcsqZl87YR&guRuovxLe>-8zhgY64-)_GVAN3UOuMWKv4jrJ1KG<>a@#!w9DQ|aL{mje1{pFsG-{6ul`n&M- z-D_{$!;k91N^N+>@84{HaLt;&l3f4b_2_($gSLW!d*Ai#Hrh1nz1!g~*FJl@(1t(r zOIh@5-=uEau>WS9opeHD!+mzXX1_2lUBBG7Z?C?IE5EYg^WOUUqXU7dlQ*9j9vmM$ z;58dg=}OSJn!0}=T7>5z0VnmRSMw29tw#+oKy)|DbIDctmdVvY;}Oe|$9MRmG;U;K zLPlBX^OpSb-FwEvyXe!(3rZ(j#PKvgw6L%!-{Mg*9*#B#XAUSWE1qW7!9_KUJIkZt zmcrzMqVh!?@N(qCyL=ybq3+sUJ|T$9npiYV*>9Ilnth&@%X{wLbsZb?5m)8BH1ZdI zAa7O5qi-~o8?Q9wqpmmQV{bL(<8DJJIBA8SfE{-{;x}sH+1VyR@Fj-?A=HB& zf68+n_J>;dQ(cb8NztpTn*gUn9AaT2Q^(f8ivm=JTR_!u9k6AhiEvV6fj8?T;jA`8|EPU-`Zu_Y@NI3!$G{GX8?=Iln^Cqd zZN!Pd9;8^=x!EXEMQQu=kh-P(TCLEn-3m(oqT5smb9hPxIyAQaHSfXPr&XY?MbE!m ztMm<2a8dd|Clki>p;-ewH+oZ?;=58!36jZKC}zOj|EU*xSx3LKWy7v6{&*e}oacBx zOZ4~Wg5E~nZ`)<*Y22xOC$F?LV^Rw8GO$@2oQsl8*6jJ!lTcnQDm{WGp^mrshxb@j zdOyZ`(<$bvQw;nzI9)yGbhqrflfAyPOGv_iaAOK`J&S5OThOVpk>iZjn&+8_Ql@77 ze50=&8g>Ao&Yjn6>f&Y>xB=e3-`-=y+D_4PbkQ?(^mk#723fly)cuWFx`tl`lg{{( z6m{15d;D0)aV|s+!b+!iH4Q>pkTvSN$4*fXouVEKQ4LNF!l*i-_Edv#SBQNq#8y0% zNrTWJ)CpwdQHsYs7UCWXajyeW@E`a6F62*r>8@Z5PbquJ-Y0yPL1V{6=$IT$jwVC1 z`AJ@mCQ~!M>(P~?H1oPF+%mumy%oMfCP}@?2RqVJ_*^KVpS8V&^1gil=uQI~ zeCRtW5O5)k!XrgU0wnrYAblN$?oaF?IY6TOE&AS{lQgxSUx8Ouo1_|pU}E3xA#iJh zg&I=bOGvVV|80Tb@rimf(;wO>AP;*9L*dz_4NL}b7nuz?(g!EUB_|9p4@d|PZ=U>}v`HC>ef?t-V|&L8FeZmb z8V4u|N>a>y{lk;P&Blbp$jIcR=%nzZ7@8smkWJyj553?7weg=BPE%u))H@b3(Zpcu80<_ zdu>ZgO|r1Gbb2>V;Qt?> C^YX?3