diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java index 8e17021..affac01 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -64,20 +64,20 @@ public class CodeGenerator { mpg.setGlobalConfig(gc); // 数据源配置 DataSourceConfig dsc = new DataSourceConfig(); - dsc.setUrl("jdbc:mysql://192.168.81.251:3306/wms_oulun?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); + dsc.setUrl("jdbc:mysql://192.168.81.251:3306/huayu_wms?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); dsc.setDriverName("com.mysql.cj.jdbc.Driver"); dsc.setUsername("root"); - dsc.setPassword("123456"); + dsc.setPassword("P@ssw0rd."); mpg.setDataSource(dsc); // 包配置 PackageConfig pc = new PackageConfig(); - pc.setParent("org.nl."+menusName); - pc.setController("controller." + moduleName); - pc.setMapper("service."+moduleName+".dao.mapper"); - pc.setService("service." + moduleName); - pc.setServiceImpl("service." + moduleName + ".impl"); - pc.setEntity("service." + moduleName + ".dao"); - pc.setXml("service." + moduleName + ".dao.mapper.xml"); + pc.setParent("org.nl."+menusName+"."+ moduleName); + pc.setController("controller"); + pc.setMapper("service.dao.mapper"); + pc.setService("service"); + pc.setServiceImpl("service.impl"); + pc.setEntity("service.dao"); + pc.setXml("service.dao.mapper.xml"); mpg.setPackageInfo(pc); // // 自定义配置 InjectionConfig cfg = new InjectionConfig() { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/controller/StIvtCheckinvController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/controller/StIvtCheckinvController.java new file mode 100644 index 0000000..ff4eda4 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/controller/StIvtCheckinvController.java @@ -0,0 +1,21 @@ +package org.nl.wms.warehouse_manage.check.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 盘点单单主表 前端控制器 + *

+ * + * @author generator + * @since 2025-09-02 + */ +@RestController +@RequestMapping("api/stIvtCheckinv") +public class StIvtCheckinvController { + +} + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/IStIvtCheckdtlService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/IStIvtCheckdtlService.java new file mode 100644 index 0000000..83d5c37 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/IStIvtCheckdtlService.java @@ -0,0 +1,16 @@ +package org.nl.wms.warehouse_manage.check.service; + +import org.nl.wms.warehouse_manage.check.service.dao.StIvtCheckdtl; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 盘点单明细表 服务类 + *

+ * + * @author generator + * @since 2025-09-02 + */ +public interface IStIvtCheckdtlService extends IService { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/IStIvtCheckinvService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/IStIvtCheckinvService.java new file mode 100644 index 0000000..3548acd --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/IStIvtCheckinvService.java @@ -0,0 +1,16 @@ +package org.nl.wms.warehouse_manage.check.service; + +import org.nl.wms.warehouse_manage.check.service.dao.StIvtCheckinv; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 盘点单单主表 服务类 + *

+ * + * @author generator + * @since 2025-09-02 + */ +public interface IStIvtCheckinvService extends IService { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/StIvtCheckdtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/StIvtCheckdtl.java new file mode 100644 index 0000000..6609b6d --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/StIvtCheckdtl.java @@ -0,0 +1,120 @@ +package org.nl.wms.warehouse_manage.check.service.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 盘点单明细表 + *

+ * + * @author generator + * @since 2025-09-02 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("st_ivt_checkdtl") +public class StIvtCheckdtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 盘点单明细id + */ + private String id; + + /** + * 盘点单标识 + */ + private String check_id; + + /** + * 仓库 + */ + private String stor_code; + + /** + * 盘点库区 + */ + private String sect_code; + + /** + * 盘点货位 + */ + private String struct_code; + + /** + * 状态 + */ + private String status; + + /** + * 存储载具编码 + */ + private String storagevehicle_code; + + /** + * 盘点位 + */ + private String point_code; + + /** + * 物料标识 + */ + private String material_code; + + /** + * 批次 + */ + private String pcsn; + + /** + * 库存数量 + */ + private BigDecimal qty; + + /** + * 基本计量单位 + */ + private String qty_unit_id; + + /** + * 单位名称 + */ + private String qty_unit_name; + + /** + * 盘点数量 + */ + private BigDecimal fac_qty; + + /** + * 盘点结果 + */ + private String check_result; + + /** + * 盘点人姓名 + */ + private String check_name; + + /** + * 盘点时间 + */ + private String check_time; + + /** + * 明细备注 + */ + private String remark; + + /** + * 虚拟盘点(不生成任务) + */ + private Boolean virtual; + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/StIvtCheckinv.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/StIvtCheckinv.java new file mode 100644 index 0000000..4d2b7bc --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/StIvtCheckinv.java @@ -0,0 +1,89 @@ +package org.nl.wms.warehouse_manage.check.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 盘点单单主表 + *

+ * + * @author generator + * @since 2025-09-02 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("st_ivt_checkinv") +public class StIvtCheckinv implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标识 + */ + private String id; + + /** + * 单据编号 + */ + private String bill_code; + + /** + * 单据类型 + */ + private String bill_type; + + /** + * 业务日期 + */ + private String bill_date; + + /** + * 单据状态 + */ + private String bill_status; + + /** + * 仓库标识 + */ + private String stor_code; + + /** + * 库区标识 + */ + private String sect_code; + + /** + * 明细数 + */ + private Integer detail; + + /** + * 备注 + */ + private String remark; + + /** + * 制单人姓名 + */ + private String create_name; + + /** + * 制单时间 + */ + private String create_time; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/StIvtCheckdtlMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/StIvtCheckdtlMapper.java new file mode 100644 index 0000000..3eac108 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/StIvtCheckdtlMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.warehouse_manage.check.service.dao.mapper; + +import org.nl.wms.warehouse_manage.check.service.dao.StIvtCheckdtl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 盘点单明细表 Mapper 接口 + *

+ * + * @author generator + * @since 2025-09-02 + */ +public interface StIvtCheckdtlMapper extends BaseMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/StIvtCheckinvMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/StIvtCheckinvMapper.java new file mode 100644 index 0000000..c42e145 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/StIvtCheckinvMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.warehouse_manage.check.service.dao.mapper; + +import org.nl.wms.warehouse_manage.check.service.dao.StIvtCheckinv; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 盘点单单主表 Mapper 接口 + *

+ * + * @author generator + * @since 2025-09-02 + */ +public interface StIvtCheckinvMapper extends BaseMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/xml/StIvtCheckdtlMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/xml/StIvtCheckdtlMapper.xml new file mode 100644 index 0000000..042a094 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/xml/StIvtCheckdtlMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/xml/StIvtCheckinvMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/xml/StIvtCheckinvMapper.xml new file mode 100644 index 0000000..bf4119a --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/dao/mapper/xml/StIvtCheckinvMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/impl/StIvtCheckdtlServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/impl/StIvtCheckdtlServiceImpl.java new file mode 100644 index 0000000..738f4c5 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/impl/StIvtCheckdtlServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.warehouse_manage.check.service.impl; + +import org.nl.wms.warehouse_manage.check.service.dao.StIvtCheckdtl; +import org.nl.wms.warehouse_manage.check.service.dao.mapper.StIvtCheckdtlMapper; +import org.nl.wms.warehouse_manage.check.service.IStIvtCheckdtlService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 盘点单明细表 服务实现类 + *

+ * + * @author generator + * @since 2025-09-02 + */ +@Service +public class StIvtCheckdtlServiceImpl extends ServiceImpl implements IStIvtCheckdtlService { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/impl/StIvtCheckinvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/impl/StIvtCheckinvServiceImpl.java new file mode 100644 index 0000000..1fd3337 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/check/service/impl/StIvtCheckinvServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.warehouse_manage.check.service.impl; + +import org.nl.wms.warehouse_manage.check.service.dao.StIvtCheckinv; +import org.nl.wms.warehouse_manage.check.service.dao.mapper.StIvtCheckinvMapper; +import org.nl.wms.warehouse_manage.check.service.IStIvtCheckinvService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 盘点单单主表 服务实现类 + *

+ * + * @author generator + * @since 2025-09-02 + */ +@Service +public class StIvtCheckinvServiceImpl extends ServiceImpl implements IStIvtCheckinvService { + +} diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 1accd77..7b29f3a 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -9,10 +9,10 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3307}/${DB_NAME:hyjm_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:huayu_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false # url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms_oulun}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:P@ssw0rd.} # 初始连接数 initial-size: 15 # 最小连接数