diff --git a/anrui-gateway/src/main/resources/application.yml b/anrui-gateway/src/main/resources/application.yml index b9670cefca..498fab8c04 100644 --- a/anrui-gateway/src/main/resources/application.yml +++ b/anrui-gateway/src/main/resources/application.yml @@ -91,6 +91,12 @@ spring: uri: lb://yxt-as filters: - StripPrefix=1 + - id: yxt-wms + predicates: + - Path= /wms/** + uri: lb://yxt-wms + filters: + - StripPrefix=1 ignore: whites: diff --git a/doc/databases/yxt-as.sql b/doc/databases/yxt-as.sql new file mode 100644 index 0000000000..9656385e0a --- /dev/null +++ b/doc/databases/yxt-as.sql @@ -0,0 +1,106 @@ +DROP TABLE IF EXISTS `as_busrepair_bill`; +CREATE TABLE `as_busrepair_bill` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名', + `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号', + `billType` int(32) DEFAULT NULL COMMENT '单据类型（0销售单,1维修工单）', + `entryTime` timestamp null DEFAULT NULL COMMENT '进厂时间（带时分秒）-工单', + `estimatedFinishTime` timestamp null DEFAULT NULL COMMENT '预计完工时间-工单', + `subjectSid` varchar(64) DEFAULT NULL COMMENT '科目sid', + `subject` varchar(64) DEFAULT NULL COMMENT '科目', + `waitorSid` varchar(64) DEFAULT NULL COMMENT '服务顾问sid（单选）（用户sid）', + `waitorName` varchar(64) DEFAULT NULL COMMENT '服务顾问姓名', + `mainRepairers` text DEFAULT NULL COMMENT '主修人（可多选）-工单', + `barCode` varchar(64) DEFAULT NULL COMMENT '条形码-销售单', + `shotRemarks` varchar(64) DEFAULT NULL COMMENT '快捷备注（选择）-销售单', + `printRemarks` varchar(64) DEFAULT NULL COMMENT '备注(打印)', + `discountAmount` decimal(10, 2) DEFAULT NULL COMMENT '整体优惠金额', + `coupon` decimal(10, 2) DEFAULT NULL COMMENT '整体优惠券', + `scoreDeduct` decimal(10, 2) DEFAULT NULL COMMENT '积分抵扣', + `nodeCode` int(32) DEFAULT NULL COMMENT '当前环节编码（登记1、派工2、竣工3、结算4）', + `nodeName` varchar(64) DEFAULT NULL COMMENT '当前环节', + `nodeTime` timestamp null DEFAULT NULL COMMENT '进入当前环节时间', + `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='维修工单'; + +DROP TABLE IF EXISTS `as_busrepair_inventorybill`; +CREATE TABLE `as_busrepair_inventorybill` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '1正常、0作废，申请-审批中-完成-作废', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '来源单sid,维修工单sid', + `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号', + `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名', + `busTypeKey` varchar(64) DEFAULT NULL COMMENT '业务类型key 0维修出库、1维修退库', + `busTypeValue` varchar(64) DEFAULT NULL COMMENT '业务类型value', + `warehouseManagerSid` varchar(64) DEFAULT NULL COMMENT '库管操作人sid', + `warehouseManager` varchar(64) DEFAULT NULL COMMENT '库管操作人', + `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='维修出/退库单'; + +DROP TABLE IF EXISTS `as_busrepair_inventorybill_detail`; +CREATE TABLE `as_busrepair_inventorybill_detail` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid', + `inventorySid` varchar(64) DEFAULT NULL COMMENT '商品库存sid', + `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid', + `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称', + `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码（图号）', + `specification` varchar(64) DEFAULT NULL COMMENT '规格', + `goodsModel` varchar(64) DEFAULT NULL COMMENT '型号', + `currentCount` decimal(10,0) DEFAULT NULL COMMENT '出库前的库存量', + `unit` varchar(64) DEFAULT NULL COMMENT '计量单位', + `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid', + `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称', + `warehouseArea` varchar(64) DEFAULT NULL COMMENT '货位', + `needCount` decimal(10,0) DEFAULT NULL COMMENT '需求数量（维修工单中）', + `outboundCount` decimal(10,0) DEFAULT NULL COMMENT '已出库数量（维修工单中，计算）', + `count` decimal(10,0) DEFAULT NULL COMMENT '出/退库数量', + `price` decimal(10, 2) DEFAULT NULL COMMENT '销售价（元）', + `subjectSid` varchar(64) DEFAULT NULL COMMENT '科目sid', + `subject` varchar(64) DEFAULT NULL COMMENT '科目', + `operUserSid` varchar(64) DEFAULT NULL COMMENT '领料人sid', + `operName` varchar(64) DEFAULT NULL COMMENT '领料人姓名', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='单据明细'; \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java new file mode 100644 index 0000000000..46b23deb21 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java @@ -0,0 +1,62 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: 维修工单 + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Data +public class AsBusrepairBill extends BaseEntity { + private static final long serialVersionUID = -3448985502134489814L; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("单据类型") + private Integer billType; + @ApiModelProperty("进厂时间") + private Date entryTime; + @ApiModelProperty("预计完工时间-工单") + private Date estimatedFinishTime; + @ApiModelProperty("科目sid") + private String subjectSid; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("服务顾问sid") + private String waitorSid; + @ApiModelProperty("服务顾问姓名") + private String waitorName; + @ApiModelProperty("主修人（可多选）销售单") + private String mainRepairers; + @ApiModelProperty("条形码-销售单") + private String barCode; + @ApiModelProperty("快捷备注-销售单") + private String shotRemarks; + @ApiModelProperty("备注") + private String printRemarks; + @ApiModelProperty("整体优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("整体优惠券") + private BigDecimal coupon; + @ApiModelProperty("积分抵扣") + private BigDecimal scoreDeduct; + @ApiModelProperty("当前环节编码（登记1、派工2、竣工3、结算4）") + private int nodeCode; + @ApiModelProperty("当前环节") + private String nodeName; + @ApiModelProperty("进入当前环节时间") + private Date nodeTime; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListQuery.java new file mode 100644 index 0000000000..878c9bf8d5 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListQuery.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Data +public class AsBusrepairBillListQuery implements Query { + private static final long serialVersionUID = -8064420711405073914L; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListVo.java new file mode 100644 index 0000000000..7fe326ede3 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillListVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Data +public class AsBusrepairBillListVo { + + private String sid; + + private String billNo; + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybill.java new file mode 100644 index 0000000000..58b8d7937e --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybill.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.as.api.asbusrepairinventorybill; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 维修出/退库 + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Data +public class AsBusrepairInventorybill extends BaseEntity { + private static final long serialVersionUID = 4272891517343161399L; + + @ApiModelProperty("来源单sid") + private String sourceBillSid; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("业务类型key") + private String busTypeKey; + @ApiModelProperty("业务类型value") + private String busTypeValue; + @ApiModelProperty("库管操作人sid") + private String warehouseManagerSid; + @ApiModelProperty("库管操作人") + private String warehouseManager; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java new file mode 100644 index 0000000000..770479f79c --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java @@ -0,0 +1,57 @@ +package com.yxt.anrui.as.api.asbusrepairinventorybilldetail; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Data +public class AsBusrepairInventorybillDetail extends BaseEntity { + private static final long serialVersionUID = 7134535185685249599L; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("商品库存sid") + private String inventorySid; + @ApiModelProperty("商品sid") + private String goodsSid; + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("商品编码") + private String goodsCode; + @ApiModelProperty("规格") + private String specification; + @ApiModelProperty("型号") + private String goodsModel; + @ApiModelProperty("出库前的库存量") + private BigDecimal currentCount; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("货位") + private String warehouseArea; + @ApiModelProperty("需求数量") + private BigDecimal needCount; + @ApiModelProperty("已出库数量") + private BigDecimal outboundCount; + @ApiModelProperty("出/退库数量") + private BigDecimal count; + @ApiModelProperty("销售价（元）") + private BigDecimal price; + @ApiModelProperty("科目sid") + private String subjectSid; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("领料人") + private String operUserSid; + @ApiModelProperty("领料人姓名") + private String operName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java new file mode 100644 index 0000000000..d9913fb742 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.as.biz.asbusrepairbill; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Mapper +public interface AsBusrepairBillMapper extends BaseMapper { + IPage getList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml new file mode 100644 index 0000000000..19cc240996 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java new file mode 100644 index 0000000000..72a09d7406 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.as.biz.asbusrepairbill; + +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListQuery; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 维修工单 + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@RestController +@RequestMapping("v1/AsBusrepairBill") +public class AsBusrepairBillRest { + + @Autowired + private AsBusrepairBillService asBusrepairBillService; + + @PostMapping("getList") + @ApiOperation("维修领料获取派工维修单") + ResultBean> getList(@RequestBody PagerQuery pagerQuery){ + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairBillService.getList(pagerQuery); + return rb.success().setData(pv); + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java new file mode 100644 index 0000000000..ef2fb939e2 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.as.biz.asbusrepairbill; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListQuery; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Service +public class AsBusrepairBillService extends MybatisBaseService { + + /** + * 维修领料获取派工单 + * + * @param pagerQuery + * @return + */ + public PagerVo getList(PagerQuery pagerQuery) { + AsBusrepairBillListQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java new file mode 100644 index 0000000000..f29bdcd2b4 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.as.biz.asbusrepairinventorybill; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybill; +import org.apache.ibatis.annotations.Mapper; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Mapper +public interface AsBusrepairInventorybillMapper extends BaseMapper { +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml new file mode 100644 index 0000000000..581ac8a9ef --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java new file mode 100644 index 0000000000..a2edca9429 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.as.biz.asbusrepairinventorybill; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 维修出/退库单 + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@RestController +@RequestMapping("v1/AsBusrepairInventorybill") +public class AsBusrepairInventorybillRest { +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java new file mode 100644 index 0000000000..ba3a72bfa0 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.as.biz.asbusrepairinventorybill; + +import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybill; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Service +public class AsBusrepairInventorybillService extends MybatisBaseService { +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java new file mode 100644 index 0000000000..271dd29fc3 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; +import org.apache.ibatis.annotations.Mapper; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Mapper +public interface AsBusrepairInventorybillDetailMapper extends BaseMapper { +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml new file mode 100644 index 0000000000..4ed2139475 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java new file mode 100644 index 0000000000..cd84ebf393 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 维修出/退库单据明细 + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@RestController +@RequestMapping("v1/AsBusrepairInventorybillDetail") +public class AsBusrepairInventorybillDetailRest { +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java new file mode 100644 index 0000000000..c518dbae3e --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail; + +import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Service +public class AsBusrepairInventorybillDetailService extends MybatisBaseService { +} diff --git a/yxt-as/src/main/resources/application-devv.yml b/yxt-as/src/main/resources/application-devv.yml index be7693303a..8d74ed9fcd 100644 --- a/yxt-as/src/main/resources/application-devv.yml +++ b/yxt-as/src/main/resources/application-devv.yml @@ -1,23 +1,24 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/yxt_4sas?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://39.104.100.138:3306/yxt_4sas?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: root + password: yxt_mysql_138 cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 39.104.100.138:8848 + register-enabled: false redis: database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 + host: 39.104.100.138 jedis: pool: max-active: -1 #连接池最大连接数（使用负值表示没有限制） max-idle: 8 #连接池中的最大空闲连接 max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） min-idle: 0 # 连接池中的最小空闲连接 - password: 123456 + password: port: 6379 timeout: 0 # 连接超时时间（毫秒）