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 8ea30294..63539ccd 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls differ