diff --git a/fhs_app/fhs_app_all_in_one/pom.xml b/fhs_app/fhs_app_all_in_one/pom.xml index 3a6fe421984ed8fdf8b31d2de3f311dbe722ac7f..36dbde1dac94ec94932ac4988d03db4c209ff10b 100644 --- a/fhs_app/fhs_app_all_in_one/pom.xml +++ b/fhs_app/fhs_app_all_in_one/pom.xml @@ -6,7 +6,7 @@ fhs_app com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_app/fhs_app_all_in_one/src.lnk b/fhs_app/fhs_app_all_in_one/src.lnk new file mode 100644 index 0000000000000000000000000000000000000000..a14c4397f0205e6f16d1419183bf0eb6534b85c7 Binary files /dev/null and b/fhs_app/fhs_app_all_in_one/src.lnk differ diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/controller/AgreementAgreementController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/controller/AgreementAgreementController.java new file mode 100644 index 0000000000000000000000000000000000000000..9f90d3b5ecdbb7961f1f188f12841bb548006d1d --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/controller/AgreementAgreementController.java @@ -0,0 +1,45 @@ +package com.fhs.agreement.controller; + +import cn.dev33.satoken.annotation.SaCheckRole; +import com.fhs.agreement.po.AgreementAgreementPO; +import com.fhs.agreement.service.AgreementAgreementService; +import com.fhs.agreement.vo.AgreementAgreementVO; +import com.fhs.basics.api.anno.LogMethod; +import com.fhs.core.result.HttpResult; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; + +/** + * 采购协议(AgreementAgreement)表控制层 + * + * @author caiyu + * @since 2022-06-01 10:09:44 + */ + +@RestController +@Api(tags={"采购协议"}) +@RequestMapping("/ms/agreementAgreement") +public class AgreementAgreementController extends ModelSuperController { + + @Autowired + private AgreementAgreementService agreementAgreementService; + + /** + * 获取单条数据协议信息+商品信息 + * @return + */ + @LogMethod + @ApiOperation("详情-请使用此方法") + @SaCheckRole("agreemenetAgreemenet:see") + @GetMapping("getAgreementGoosInfo") + public AgreementAgreementVO getAgreementGoosInfo(@RequestParam("id") int id, HttpServletRequest request) { + return agreementAgreementService.getAgreementGoosInfo(id); + } + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/mapper/AgreementAgreementMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/mapper/AgreementAgreementMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..2248559a0c7cf817edf3b08d7fba8418f3ce87ae --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/mapper/AgreementAgreementMapper.java @@ -0,0 +1,16 @@ +package com.fhs.agreement.mapper; + +import com.fhs.agreement.po.AgreementAgreementPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 采购协议(AgreementAgreement)表数据库访问层 + * + * @author caiyu + * @since 2022-06-01 10:09:46 + */ +@Repository +public interface AgreementAgreementMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/mapper/AgreementGoodsSettMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/mapper/AgreementGoodsSettMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..11c513f33f142ed561b0b27003ca25f6e74cf9e8 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/mapper/AgreementGoodsSettMapper.java @@ -0,0 +1,34 @@ +package com.fhs.agreement.mapper; + +import com.fhs.agreement.po.AgreementGoodsSettPO; +import com.fhs.agreement.vo.AgreementGoodsSettVO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 采购协议商品(AgreementGoodsSett)表数据库访问层 + * + * @author caiyu + * @since 2022-06-01 11:16:32 + */ +@Repository +public interface AgreementGoodsSettMapper extends FhsBaseMapper { + + + @Delete({" "}) + void physicsDelete(@Param("agreemenetId") int agreemenetId); + + @Select({" "}) + List goosByaAreementId(@Param("agreemenetId") int agreemenetId); + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/po/AgreementAgreementPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/po/AgreementAgreementPO.java new file mode 100644 index 0000000000000000000000000000000000000000..d5cb741587739ba562d9e5aa0af4e4358d019f9e --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/po/AgreementAgreementPO.java @@ -0,0 +1,144 @@ +package com.fhs.agreement.po; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fhs.agreement.vo.AgreementGoodsSettVO; +import com.fhs.basics.constant.BaseTransConstant; +import com.fhs.common.utils.DateUtils; +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.Add; +import com.fhs.core.base.valid.group.Delete; +import com.fhs.core.base.valid.group.Update; +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 采购协议(AgreementAgreement)实体类 + * + * @author caiyu + * @since 2022-06-01 10:09:46 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_agreement_agreement") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="AgreementAgreementPO",description ="采购协议") +public class AgreementAgreementPO extends BasePO { + + private static final long serialVersionUID = 150133574788971137L; + + @TableId(value = "id", type = IdType.AUTO) + @NotNull(message = "id字段不可以为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 协议号 + */ + @Length(message = "协议号字段的长度最大为20", groups = {Add.class, Update.class}, max = 20) + @TableField("no") + @ApiModelProperty(value = "协议号") + private String no; + + /** + * 状态 0未审核 1已审核 2已驳回 + */ + @TableField("status") + @ApiModelProperty(value = "状态 0未审核 1已审核 2已驳回") + @Trans(type = TransType.DICTIONARY, key = "agreementState") + private Integer status; + + /** + * 订单方id + */ + @TableField("order_party_id") + @ApiModelProperty(value = "订单方id") + @Trans(type = TransType.RPC, targetClassName = "com.fhs.supplier.po.SupplierOrderPartyPO", alias = "orderPartyId", fields = {"name", "orderPartyCode"}, serviceName = "basic", dataSource = "basic") + private Integer orderPartyId; + + /** + * 供应商id + */ + @TableField("supplier_id") + @ApiModelProperty(value = "供应商id") + @Trans(type = TransType.RPC, targetClassName = "com.fhs.supplier.po.SupplierSupplierPO", alias = "supplierId", fields = {"name", "supplierCode"}, serviceName = "basic", dataSource = "basic") + private Integer supplierId; + + /** + * 合同编号 + */ + @Length(message = "合同编号字段的长度最大为64", groups = {Add.class, Update.class}, max = 64) + @TableField("contract_no") + @ApiModelProperty(value = "合同编号") + private String contractNo; + + /** + * 明细数 + */ + @TableField("detail_num") + @ApiModelProperty(value = "明细数") + private Integer detailNum; + + /** + * 所属组织 + */ + @TableField("org_id") + @ApiModelProperty(value = "所属组织") + @Trans(type = TransType.AUTO_TRANS, key = BaseTransConstant.ORG) + private String orgId; + + /** + * 开始时间 + */ + @TableField("start_time") + @ApiModelProperty(value = "开始时间") + @JSONField(format = DateUtils.DATETIME_PATTERN_DATE) + private Date startTime; + + /** + * 结束时间 + */ + @TableField("end_time") + @ApiModelProperty(value = "结束时间") + @JSONField(format = DateUtils.DATETIME_PATTERN_DATE) + private Date endTime; + + /** + * 备注 + */ + @Length(message = "备注字段的长度最大为200", groups = {Add.class, Update.class}, max = 200) + @TableField("remark") + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 商品所有id + */ + @Length(message = "商品ids", groups = {Add.class, Update.class}, max = 200) + @TableField("goods_id") + @ApiModelProperty(value = "商品ids") + private String goodsId; + + /** + * 商品 + */ + @TableField(exist = false) + private AgreementGoodsSettVO[] goodsVOs; + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/po/AgreementGoodsSettPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/po/AgreementGoodsSettPO.java new file mode 100644 index 0000000000000000000000000000000000000000..0477a4dba139425ca7e47b4be69dfdbe6064c171 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/po/AgreementGoodsSettPO.java @@ -0,0 +1,127 @@ +package com.fhs.agreement.po; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fhs.common.utils.DateUtils; +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.Delete; +import com.fhs.core.base.valid.group.Update; +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 采购协议商品(AgreementGoodsSett)实体类 + * + * @author caiyu + * @since 2022-06-01 11:16:33 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_agreement_goods_sett") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="AgreementGoodsSettPO",description ="采购协议商品") +public class AgreementGoodsSettPO extends BasePO { + + private static final long serialVersionUID = -40708952674519768L; + + @TableId(value = "id", type = IdType.AUTO) + @NotNull(message = "id字段不能为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 商品id + */ + @TableField("goods_id") + @ApiModelProperty(value = "商品id") + private Integer goodsId; + + /** + * 采购协议id + */ + @TableField("agreement_id") + @ApiModelProperty(value = "采购协议id") + private Integer agreementId; + + /** + * 商品规格id + */ + @TableField("specification_id") + @ApiModelProperty(value = "商品规格id") + private Integer specificationId; + + /** + * 税率 + */ + @TableField("rate") + @ApiModelProperty(value = "税率") + @Trans(type = TransType.DICTIONARY,key = "rate") + private Integer rate; + + /** + * 含税单价 + */ + @TableField("tax_unit_price") + @ApiModelProperty(value = "含税单价") + private Double taxUnitPrice; + + /** + * 去税单价 + */ + @TableField("exclude_tax_unit_price") + @ApiModelProperty(value = "去税单价") + private Double excludeTaxUnitPrice; + + /** + * 采购单价 + */ + @TableField("purchase_price") + @ApiModelProperty(value = "采购单价") + private Double purchasePrice; + + /** + * 开始时间 + */ + @TableField("start_time") + @ApiModelProperty(value = "开始时间") + @JSONField(format = DateUtils.DATETIME_PATTERN_DATE) + private Date startTime; + + /** + * 结束时间 + */ + @TableField("end_time") + @ApiModelProperty(value = "结束时间") + @JSONField(format = DateUtils.DATETIME_PATTERN_DATE) + private Date endTime; + + /** + * 是否可退 + */ + @TableField("is_return") + @ApiModelProperty(value = "是否可退") + @Trans(type = TransType.DICTIONARY, key = "yesOrNo") + private Integer isReturn; + + /** + * 最小订单数量 + */ + @TableField("min_order_num") + @ApiModelProperty(value = "最小订单数量") + private Integer minOrderNum; + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/AgreementAgreementService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/AgreementAgreementService.java new file mode 100644 index 0000000000000000000000000000000000000000..87cce2889b15cab8256b14b88642350280721332 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/AgreementAgreementService.java @@ -0,0 +1,18 @@ +package com.fhs.agreement.service; + +import com.fhs.agreement.po.AgreementAgreementPO; +import com.fhs.agreement.vo.AgreementAgreementVO; +import com.fhs.core.base.service.BaseService; + +/** + * 采购协议(AgreementAgreement)}表服务接口 + * + * @author caiyu + * @since 2022-06-01 10:09:42 + */ +public interface AgreementAgreementService extends BaseService{ + + AgreementAgreementVO getAgreementGoosInfo(int id); + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/AgreementGoodsSettService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/AgreementGoodsSettService.java new file mode 100644 index 0000000000000000000000000000000000000000..e0682cec5cc787c7a894cb6023e566fabebf1885 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/AgreementGoodsSettService.java @@ -0,0 +1,21 @@ +package com.fhs.agreement.service; + +import com.fhs.agreement.po.AgreementGoodsSettPO; +import com.fhs.agreement.vo.AgreementGoodsSettVO; +import com.fhs.core.base.service.BaseService; + +import java.util.List; + +/** + * 采购协议商品(AgreementGoodsSett)}表服务接口 + * + * @author caiyu + * @since 2022-06-01 11:16:29 + */ +public interface AgreementGoodsSettService extends BaseService{ + + void physicsDelete(int agreemenetId); + + List goosByaAreementId(int agreemenetId); + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementAgreementServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementAgreementServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..2e7f6492a506627ae054918365f1b1369e816412 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementAgreementServiceImpl.java @@ -0,0 +1,136 @@ +package com.fhs.agreement.service.impl; + + +import com.fhs.agreement.po.AgreementAgreementPO; +import com.fhs.agreement.po.AgreementGoodsSettPO; +import com.fhs.agreement.service.AgreementAgreementService; +import com.fhs.agreement.service.AgreementGoodsSettService; +import com.fhs.agreement.vo.AgreementAgreementVO; +import com.fhs.agreement.vo.AgreementGoodsSettVO; +import com.fhs.agreement.vo.AgreementSelectData; +import com.fhs.basics.context.UserContext; +import com.fhs.common.utils.StringUtils; +import com.fhs.core.base.service.impl.BaseServiceImpl; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.valid.checker.ParamChecker; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * 采购协议(AgreementAgreement)表服务实现类 + * + * @author caiyu + * @since 2022-06-01 10:09:43 + */ +@Service +@Namespace("agreement_agreement") +public class AgreementAgreementServiceImpl extends BaseServiceImpl implements AgreementAgreementService { + + @Autowired + AgreementGoodsSettService agreementGoodsSettService; + + @Override + public int insert(AgreementAgreementPO entity) { + entity.setStatus(0); + entity.setDetailNum(entity.getGoodsVOs().length); + int insert = super.insert(entity); + Integer id = entity.getId(); + StringBuilder goosId = new StringBuilder(); + goosId.append(","); + saveGoods(entity.getGoodsVOs(), entity.getId(),true,goosId); + SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd"); + String no = fmt.format(new Date()) + StringUtils.formatCountWith0("","%06d",id); + entity.setGoodsId(goosId.toString()); + entity.setNo(no); + List list = new ArrayList<>(); + list.add(entity); + this.batchUpdate(list); + return insert; + } + + @Override + public int updateById(AgreementAgreementPO entity) { + entity.setDetailNum(entity.getGoodsVOs().length); + int insert = super.updateById(entity); + StringBuilder goosId = new StringBuilder(); + goosId.append(","); + saveGoods(entity.getGoodsVOs(), entity.getId(),false,goosId); + entity.setGoodsId(goosId.toString()); + List list = new ArrayList<>(); + list.add(entity); + this.batchUpdate(list); + return insert; + } + + @Override + public int deleteById(Serializable primaryValue) { + AgreementGoodsSettPO info = new AgreementGoodsSettPO(); + info.setAgreementId(Integer.parseInt(primaryValue.toString())); + agreementGoodsSettService.deleteBean(info); + return super.deleteById(primaryValue); + } + + public void saveGoods(AgreementGoodsSettVO[] goodsVOs, int agreemenetId, boolean isAdd,StringBuilder goosId){ + if(goodsVOs == null || UserContext.getSessionuser() == null){ + return; + } + if(!isAdd){ + agreementGoodsSettService.physicsDelete(agreemenetId); + for (AgreementGoodsSettVO data: goodsVOs) { + data.preUpdate(UserContext.getSessionuser().getUserId()); + data.setAgreementId(agreemenetId); + goosId.append(data.getGoodsId()); + goosId.append(","); + } + + }else{ + for (AgreementGoodsSettVO data: goodsVOs) { + data.preInsert(UserContext.getSessionuser().getUserId()); + data.setAgreementId(agreemenetId); + goosId.append(data.getGoodsId()); + goosId.append(","); + } + } + agreementGoodsSettService.batchInsert(Arrays.asList(goodsVOs)); + } + + + @Override + public AgreementAgreementVO getAgreementGoosInfo(int id) { + AgreementAgreementVO data = super.selectById(id); + ParamChecker.isNotNullOrEmpty(data, "无效的id"); + List goodsList = agreementGoodsSettService.goosByaAreementId(id); + for (AgreementGoodsSettVO sett: goodsList) { + AgreementSelectData selectData = new AgreementSelectData(); + List goodspecifications = new ArrayList<>(); + AgreementSelectData.Goodspecification goodspecification = new AgreementSelectData.Goodspecification(); + goodspecification.setId(0); + goodspecification.setTitle("1*10"); + goodspecifications.add(goodspecification); + goodspecification = new AgreementSelectData.Goodspecification(); + goodspecification.setId(1); + goodspecification.setTitle("1*20"); + goodspecifications.add(goodspecification); + selectData.setSpecificationId(goodspecifications); + data.getSelectDataList().add(selectData); + + sett.setGoodsCode("CocaCola"); + sett.setGoodsName("可口可乐"); + sett.setUnit("瓶"); + sett.setGoodsBarcode("101010101010101011"); + } + AgreementGoodsSettVO[] goosArr = new AgreementGoodsSettVO[goodsList.size()]; + goosArr = goodsList.toArray(goosArr); + data.setGoodsVOs(goosArr); + return data; + } + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementGoodsSettServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementGoodsSettServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..3b6e62ae261631308db801df5561890028afdc7e --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/service/impl/AgreementGoodsSettServiceImpl.java @@ -0,0 +1,42 @@ +package com.fhs.agreement.service.impl; + + +import com.fhs.agreement.mapper.AgreementGoodsSettMapper; +import com.fhs.agreement.po.AgreementGoodsSettPO; +import com.fhs.agreement.service.AgreementGoodsSettService; +import com.fhs.agreement.vo.AgreementGoodsSettVO; +import com.fhs.agreement.vo.AgreementSelectData; +import com.fhs.core.base.service.impl.BaseServiceImpl; +import com.fhs.core.cache.annotation.Namespace; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 采购协议商品(AgreementGoodsSett)表服务实现类 + * + * @author caiyu + * @since 2022-06-01 11:16:31 + */ +@Service +@Namespace("agreement_goods_sett") +public class AgreementGoodsSettServiceImpl extends BaseServiceImpl implements AgreementGoodsSettService { + + @Autowired + AgreementGoodsSettMapper agreementGoodsSettMapper; + + @Override + public void physicsDelete(int agreemenetId) { + agreementGoodsSettMapper.physicsDelete(agreemenetId); + } + + //todo caiyu 方法名问题 + @Override + public List goosByaAreementId(int agreemenetId) { + List poList = agreementGoodsSettMapper.goosByaAreementId(agreemenetId); + return poList; + } + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementAgreementVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementAgreementVO.java new file mode 100644 index 0000000000000000000000000000000000000000..1b1a2ed39fb2b2b54a3e10f8875db96cd3244d5e --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementAgreementVO.java @@ -0,0 +1,38 @@ +package com.fhs.agreement.vo; + +import com.fhs.agreement.po.AgreementAgreementPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 采购协议(AgreementAgreement)实体类 + * + * @author caiyu + * @since 2022-06-01 10:09:45 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="采购协议",description ="采购协议") +public class AgreementAgreementVO extends AgreementAgreementPO implements VO { + + /** + * 商品 + */ + @ApiModelProperty("商品配置") + private AgreementGoodsSettVO[] goodsVOs; + + @ApiModelProperty("下拉数据") + private List selectDataList = new ArrayList<>(); + + } + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementGoodsSettVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementGoodsSettVO.java new file mode 100644 index 0000000000000000000000000000000000000000..59d25e044c97ac612c3e90a507fa006d8ebae3e0 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementGoodsSettVO.java @@ -0,0 +1,36 @@ +package com.fhs.agreement.vo; + +import com.fhs.agreement.po.AgreementGoodsSettPO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * 采购协议商品(AgreementGoodsSett)实体类 + * + * @author caiyu + * @since 2022-06-01 11:16:32 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "采购协议商品", description = "采购协议商品") +public class AgreementGoodsSettVO extends AgreementGoodsSettPO { + + @ApiModelProperty(value = "商品code") + private String goodsCode; + + @ApiModelProperty(value = "商品名称") + private String goodsName; + + @ApiModelProperty(value = "商品单位") + private String unit; + + @ApiModelProperty(value = "商品条码") + private String goodsBarcode; + +} + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementSelectData.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementSelectData.java new file mode 100644 index 0000000000000000000000000000000000000000..1244883592eea56be0df8f1c08bd6a019501378b --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/agreement/vo/AgreementSelectData.java @@ -0,0 +1,22 @@ +package com.fhs.agreement.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@ApiModel("编辑的时候数据下拉数据回显") +public class AgreementSelectData { + + @ApiModelProperty("商品规格") + private List specificationId = new ArrayList<>(); + + @Data + public static class Goodspecification{ + private int id; + private String title; + } +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/controller/FeePlanController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/controller/FeePlanController.java new file mode 100644 index 0000000000000000000000000000000000000000..db4d328cd1214d5bcc394e67f90710a827456e15 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/controller/FeePlanController.java @@ -0,0 +1,43 @@ +package com.fhs.fee.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fhs.common.utils.IdHelper; +import com.fhs.core.result.HttpResult; +import com.fhs.core.valid.checker.ParamChecker; +import com.fhs.fee.po.FeePlanPO; +import com.fhs.fee.po.FeeProjectPO; +import com.fhs.fee.vo.FeePlanVO; +import com.fhs.fee.vo.FeeProjectVO; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; + +import java.util.List; + +/** + * 费用方案(FeePlan)表控制层 + * + * @author wanglei + * @since 2022-06-01 15:42:18 + */ + +@RestController +@Api(tags={"费用方案"}) +@RequestMapping("/ms/feePlan") +public class FeePlanController extends ModelSuperController { + + @Autowired + private IdHelper idHelper; + + @GetMapping("findNo") + @ResponseStatus(HttpStatus.OK) + @ApiOperation(value = "获取费用方案单号", notes = "数据来源", httpMethod = "GET") + public HttpResult exportTemplate() { + long code = idHelper.nextId(); + return HttpResult.success(String.valueOf(code)); + } + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/controller/FeeProjectController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/controller/FeeProjectController.java new file mode 100644 index 0000000000000000000000000000000000000000..798b3d3766d184afeebefb3c6d5f5b26dbd2c635 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/controller/FeeProjectController.java @@ -0,0 +1,56 @@ +package com.fhs.fee.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fhs.basics.po.ServiceDictItemPO; +import com.fhs.core.exception.ParamException; +import com.fhs.core.result.HttpResult; +import com.fhs.core.valid.checker.ParamChecker; +import com.fhs.demo.pojo.ExcelField; +import com.fhs.demo.utils.ExcelBaseUtils; +import com.fhs.fee.po.FeeProjectPO; +import com.fhs.fee.service.FeeProjectService; +import com.fhs.fee.vo.FeeProjectVO; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; + +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.util.List; +import java.util.Map; + +/** + * 费用项目(FeeProject)表控制层 + * + * @author yutao + * @since 2022-05-31 14:50:22 + */ + +@RestController +@Api(tags={"费用项目"}) +@RequestMapping("/ms/feeProject") +public class FeeProjectController extends ModelSuperController { + + @Autowired + private FeeProjectService feeProjectService; + + @GetMapping("findCode") + @ResponseStatus(HttpStatus.OK) + @ApiOperation(value = "获取费用项目代码", notes = "数据来源", httpMethod = "GET") + public HttpResult exportTemplate(@RequestParam("id") String id) { + FeeProjectVO feeProjectVO = feeProjectService.selectById(id); + ParamChecker.isNotNullOrEmpty(feeProjectVO, "无效的费用分类"); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(FeeProjectPO::getParentId, id); + List feeProjectVOS = feeProjectService.selectListMP(wrapper); + //项目费用代码 = 爸爸code + 自己排第几 = 0101 + String code = feeProjectVO.getProjectCode() + String.format("%02d", feeProjectVOS.size() + 1); + return HttpResult.success(code); + } + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/mapper/FeePlanMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/mapper/FeePlanMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..e194c0498b53862689ccd35ca8894df116aa6c7f --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/mapper/FeePlanMapper.java @@ -0,0 +1,16 @@ +package com.fhs.fee.mapper; + +import com.fhs.fee.po.FeePlanPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 费用方案(FeePlan)表数据库访问层 + * + * @author wanglei + * @since 2022-06-01 15:42:19 + */ +@Repository +public interface FeePlanMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/mapper/FeeProjectMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/mapper/FeeProjectMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..998ba8fc6b594fe68a53e7a67b6b0215b7231511 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/mapper/FeeProjectMapper.java @@ -0,0 +1,16 @@ +package com.fhs.fee.mapper; + +import com.fhs.fee.po.FeeProjectPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 费用项目(FeeProject)表数据库访问层 + * + * @author yutao + * @since 2022-05-31 14:50:23 + */ +@Repository +public interface FeeProjectMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/po/FeePlanPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/po/FeePlanPO.java new file mode 100644 index 0000000000000000000000000000000000000000..23c76232ff2bd7d74022cc2a11c08ae5e8814993 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/po/FeePlanPO.java @@ -0,0 +1,109 @@ +package com.fhs.fee.po; + +import java.util.Date; +import java.io.Serializable; + +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.*; + +import javax.validation.constraints.*; + +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import org.hibernate.validator.constraints.Length; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 费用方案(FeePlan)实体类 + * + * @author wanglei + * @since 2022-06-01 15:42:19 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_fee_plan") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "FeePlanPO", description = "费用方案") +public class FeePlanPO extends BasePO { + + private static final long serialVersionUID = 444975079415076041L; + + @TableId(value = "id", type = IdType.NONE) + @NotNull(message = "${column.comment}字段不可为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "") + private Long id; + + /** + * 单号 + */ + @Length(message = "单号字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("no") + @ApiModelProperty(value = "单号") + private String no; + + /** + * 订单状态（字典）：0未审核，1审核 + */ + @TableField("status") + @ApiModelProperty(value = "订单状态（字典）：0未审核，1审核") + private Integer status; + + /** + * 订单方id + */ + @TableField("order_party_id") + @ApiModelProperty(value = "订单方id") + private Integer orderPartyId; + + /** + * 供应商id + */ + @Trans(type = TransType.RPC, targetClassName = "com.fhs.supplier.po.SupplierSupplierPO", alias = "supplierId", fields = {"name", "supplierCode"}, serviceName = "basic", dataSource = "basic") + @TableField("supplier_id") + @ApiModelProperty(value = "供应商id") + private Integer supplierId; + + /** + * 采购合同id + */ + @TableField("order_id") + @ApiModelProperty(value = "采购合同id") + private Long orderId; + + /** + * 费用项目id + */ + @Trans(type = TransType.RPC, targetClassName = "com.fhs.fee.po.FeeProjectPO", alias = "feeProjectId", fields = {"name", "projectCode"}, serviceName = "basic", dataSource = "basic") + @TableField("fee_project_id") + @ApiModelProperty(value = "费用项目id") + private Integer feeProjectId; + + /** + * 费用开始时间 + */ + @TableField("start_time") + @ApiModelProperty(value = "费用开始时间") + private Date startTime; + + /** + * 费用结束时间 + */ + @TableField("end_time") + @ApiModelProperty(value = "费用结束时间") + private Date endTime; + + /** + * 所属组织id + */ + @TableField("organization_id") + @ApiModelProperty(value = "所属组织id") + private Long organizationId; + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/po/FeeProjectPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/po/FeeProjectPO.java new file mode 100644 index 0000000000000000000000000000000000000000..926a8ff9c5f72fe246b55e1e2d1d8ab5ef7bb362 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/po/FeeProjectPO.java @@ -0,0 +1,177 @@ +package com.fhs.fee.po; + +import java.io.Serializable; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fhs.common.tree.Treeable; +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.*; +import javax.validation.constraints.*; + +import com.fhs.core.jsonfilter.anno.AutoArray; +import com.fhs.core.jsonfilter.serializer.Str2ArrayValueSerializer; +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import org.hibernate.validator.constraints.Length; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 费用项目(FeeProject)实体类 + * + * @author yutao + * @since 2022-05-31 14:50:23 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_fee_project") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="FeeProjectPO",description ="费用项目") +public class FeeProjectPO extends BasePO implements Treeable { + + private static final long serialVersionUID = -81325356050250978L; + + @TableId(value = "id", type = IdType.AUTO) + @NotNull(message = "id字段不可为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 费用项目名称 + */ + @Length(message = "费用项目名称字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("name") + @ApiModelProperty(value = "费用项目名称") + private String name; + + /** + * 费用项目编码 + */ + @Length(message = "费用项目编码字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("project_code") + @ApiModelProperty(value = "费用项目编码") + private String projectCode; + + /** + * 费用主体类型 + */ + @Trans(type = TransType.DICTIONARY, key = "costMainType") + @TableField("main_type") + @ApiModelProperty(value = "费用主体类型") + private Integer mainType; + + /** + * 税率 + */ + @Trans(type = TransType.DICTIONARY, key = "rate") + @TableField("rate") + @ApiModelProperty(value = "税率") + private Integer rate; + + /** + * 收付款类型（收付方向） + */ + @Trans(type = TransType.DICTIONARY, key = "receiptsDirection") + @TableField("proceeds_pay_type") + @ApiModelProperty(value = "收付款类型（收付方向）") + private Integer proceedsPayType; + + /** + * 票扣 + */ + @Trans(type = TransType.DICTIONARY, key = "yesOrNo") + @TableField("ticket_deduct") + @ApiModelProperty(value = "票扣") + private Integer ticketDeduct; + + /** + * 收款方式 + */ + @Trans(type = TransType.DICTIONARY, key = "paymentMethods") + @TableField("proceeds_method") + @ApiModelProperty(value = "收款方式") + private Integer proceedsMethod; + + /** + * 状态 + */ + @Trans(type = TransType.DICTIONARY, key = "is_enable") + @TableField("is_enable") + @ApiModelProperty(value = "状态") + private Integer isEnable; + + /** + * 备注 + */ + @Length(message = "备注字段的长度最大为256", groups = {Add.class, Update.class}, max = 256) + @TableField("remark") + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 固定金额 + */ + @TableField("fixed_amount") + @ApiModelProperty(value = "固定金额") + private Double fixedAmount; + + /** + * 固定去税金额 + */ + @TableField("fixed_amount_go_tax") + @ApiModelProperty(value = "固定去税金额") + private Double fixedAmountGoTax; + + /** + * 结案方式 + */ + @Trans(type = TransType.DICTIONARY, key = "settlementWay") + @TableField("settlement_way") + @ApiModelProperty(value = "结案方式") + private Integer settlementWay; + + /** + * 结案数据来源 多个逗号分隔 + */ + @Length(message = "结案数据来源 多个逗号分隔字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("settlement_datasource") + @ApiModelProperty(value = "结案数据来源 多个逗号分隔") + @AutoArray + @JSONField(serializeUsing = Str2ArrayValueSerializer.class) + private String settlementDatasource; + + /** + * 等级 + */ + @TableField("level") + @ApiModelProperty(value = "等级") + private Integer level; + + /** + * 类别（父id） + */ + @TableField("parent_id") + @ApiModelProperty(value = "类别（父id）") + private Integer parentId; + + + @Override + public Serializable getTreeNodeParentId() { + return this.parentId; + } + + @Override + public Serializable getTreeNodeId() { + return this.id; + } + + @Override + public String getTreeNodeName() { + return this.projectCode + this.name; + } +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/FeePlanService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/FeePlanService.java new file mode 100644 index 0000000000000000000000000000000000000000..0ff0583ff978ccd3c5d6ab3fe3efaea216705c05 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/FeePlanService.java @@ -0,0 +1,17 @@ +package com.fhs.fee.service; + +import com.fhs.fee.po.FeePlanPO; +import com.fhs.fee.vo.FeePlanVO; +import com.fhs.core.base.service.BaseService; + +/** + * 费用方案(FeePlan)}表服务接口 + * + * @author wanglei + * @since 2022-06-01 15:42:18 + */ +public interface FeePlanService extends BaseService{ + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/FeeProjectService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/FeeProjectService.java new file mode 100644 index 0000000000000000000000000000000000000000..8144ab1f550cf600447082247b9e0049f2778ffa --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/FeeProjectService.java @@ -0,0 +1,15 @@ +package com.fhs.fee.service; + +import com.fhs.fee.po.FeeProjectPO; +import com.fhs.fee.vo.FeeProjectVO; +import com.fhs.core.base.service.BaseService; + +/** + * 费用项目(FeeProject)}表服务接口 + * + * @author yutao + * @since 2022-05-31 14:50:20 + */ +public interface FeeProjectService extends BaseService{ + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/impl/FeePlanServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/impl/FeePlanServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..6d405340da71da2c71af89b61bc7d4556111fe8e --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/impl/FeePlanServiceImpl.java @@ -0,0 +1,22 @@ +package com.fhs.fee.service.impl; + + +import com.fhs.fee.vo.FeePlanVO; +import com.fhs.fee.po.FeePlanPO; +import com.fhs.fee.service.FeePlanService; +import org.springframework.stereotype.Service; +import com.fhs.core.db.ds.DataSource; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.base.service.impl.BaseServiceImpl; + +/** + * 费用方案(FeePlan)表服务实现类 + * + * @author wanglei + * @since 2022-06-01 15:42:18 + */ +@Service +@Namespace("fee_plan") +public class FeePlanServiceImpl extends BaseServiceImpl implements FeePlanService { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/impl/FeeProjectServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/impl/FeeProjectServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..2727d9decae34985ca124c942eadf9505689a7a5 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/service/impl/FeeProjectServiceImpl.java @@ -0,0 +1,29 @@ +package com.fhs.fee.service.impl; + + +import com.fhs.core.base.service.impl.BaseServiceImpl; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.valid.checker.ParamChecker; +import com.fhs.fee.po.FeeProjectPO; +import com.fhs.fee.service.FeeProjectService; +import com.fhs.fee.vo.FeeProjectVO; +import org.springframework.stereotype.Service; + +/** + * 费用项目(FeeProject)表服务实现类 + * + * @author yutao + * @since 2022-05-31 14:50:21 + */ +@Service +@Namespace("fee_project") +public class FeeProjectServiceImpl extends BaseServiceImpl implements FeeProjectService { + @Override + public int insert(FeeProjectPO entity) { + ParamChecker.isNotNullOrEmpty(entity.getParentId(), "父类id不能为空"); + FeeProjectVO feeProjectVO = this.selectById(entity.getParentId()); + ParamChecker.isNotNullOrEmpty(feeProjectVO, "无效的父类id"); + entity.setLevel(feeProjectVO.getLevel() + 1); + return super.insert(entity); + } +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/vo/FeePlanVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/vo/FeePlanVO.java new file mode 100644 index 0000000000000000000000000000000000000000..326c931709ec864fc08e8e0590d96428630c03e8 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/vo/FeePlanVO.java @@ -0,0 +1,24 @@ +package com.fhs.fee.vo; + +import java.util.Date; + +import com.fhs.fee.po.FeePlanPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import lombok.*; + +/** + * 费用方案(FeePlan)实体类 + * + * @author wanglei + * @since 2022-06-01 15:42:18 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="费用方案",description ="费用方案") +public class FeePlanVO extends FeePlanPO implements VO { + + } + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/vo/FeeProjectVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/vo/FeeProjectVO.java new file mode 100644 index 0000000000000000000000000000000000000000..c4c2f80da72cd24a17e7627fd70488c5ea8a75e8 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/fee/vo/FeeProjectVO.java @@ -0,0 +1,25 @@ +package com.fhs.fee.vo; + + +import com.fhs.fee.po.FeeProjectPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import lombok.*; + +import java.io.Serializable; + +/** + * 费用项目(FeeProject)实体类 + * + * @author yutao + * @since 2022-05-31 14:50:22 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="费用项目",description ="费用项目") +public class FeeProjectVO extends FeeProjectPO implements VO { + +} + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/constant/SupplierConstant.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/constant/SupplierConstant.java new file mode 100644 index 0000000000000000000000000000000000000000..b26e0800eed676dc2dbe4b3fe9f13e77a8452bef --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/constant/SupplierConstant.java @@ -0,0 +1,16 @@ +package com.fhs.supplier.constant; + +/** + * 供应商管理相关的常量 + */ +public interface SupplierConstant { + /** + * 供应商对账条件配置编码前缀 + */ + String RECONCILIATIONC_PRE = "DZ"; + + /** + * 供应商付账条件配置编码前缀 + */ + String PAYMENT_PRE = "FC"; +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierOrderPartyController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierOrderPartyController.java new file mode 100644 index 0000000000000000000000000000000000000000..69ab16b6b7f9efdebce410c26df3df3d66f7367f --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierOrderPartyController.java @@ -0,0 +1,22 @@ +package com.fhs.supplier.controller; + +import com.fhs.supplier.po.SupplierOrderPartyPO; +import com.fhs.supplier.vo.SupplierOrderPartyVO; +import org.springframework.web.bind.annotation.*; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; + +/** + * 订单方资料(SupplierOrderParty)表控制层 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ + +@RestController +@Api(tags={"订单方资料"}) +@RequestMapping("/ms/supplierOrderParty") +public class SupplierOrderPartyController extends ModelSuperController { + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierOrderStatusController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierOrderStatusController.java new file mode 100644 index 0000000000000000000000000000000000000000..7c774bdffb187fa84e00bf7422604658014c9688 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierOrderStatusController.java @@ -0,0 +1,22 @@ +package com.fhs.supplier.controller; + +import com.fhs.supplier.po.SupplierOrderStatusPO; +import com.fhs.supplier.vo.SupplierOrderStatusVO; +import org.springframework.web.bind.annotation.*; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; + +/** + * 订单方状态管理(SupplierOrderStatus)表控制层 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ + +@RestController +@Api(tags={"订单方状态管理"}) +@RequestMapping("/ms/supplierOrderStatus") +public class SupplierOrderStatusController extends ModelSuperController { + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierPaymentConditionsController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierPaymentConditionsController.java new file mode 100644 index 0000000000000000000000000000000000000000..d9cc50003eb31e1e6e4f4f639fafb0fd240f1cb7 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierPaymentConditionsController.java @@ -0,0 +1,62 @@ +package com.fhs.supplier.controller; + +import cn.dev33.satoken.annotation.SaCheckRole; +import com.fhs.basics.api.anno.LogMethod; +import com.fhs.basics.vo.ServiceDictItemVO; +import com.fhs.supplier.po.SupplierPaymentConditionsPO; +import com.fhs.supplier.vo.SupplierPaymentConditionsVO; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +/** + * 供应商付款条件(SupplierPaymentConditions)表控制层 + * + * @author liangxiaotao + * @since 2022-06-06 11:09:09 + */ + +@RestController +@Api(tags={"供应商付款条件"}) +@RequestMapping("/ms/supplierPaymentConditions") +public class SupplierPaymentConditionsController extends ModelSuperController { + + /** + * 当月天数 + * @return + */ + @LogMethod + @ApiOperation("当月天数") + @SaCheckRole("supplierPaymentConditions:see") + @GetMapping("dateBaseDayList") + public List dateBaseDayList(HttpServletRequest request) { + List list = new ArrayList<>(); + for (int i = 1; i <= getCurrentMonthDay(); i++) { + ServiceDictItemVO dict = new ServiceDictItemVO(); + dict.setDictCode(i + ""); + dict.setDictDesc(i + ""); + list.add(dict); + } + return list; + } + + /** + * 获取当月天数 + * @return + */ + public static int getCurrentMonthDay() { + Calendar a = Calendar.getInstance(); + a.set(Calendar.DATE, 1); + a.roll(Calendar.DATE, -1); + int maxDate = a.get(Calendar.DATE); + return maxDate; + } + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierReconciliationConditionsController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierReconciliationConditionsController.java new file mode 100644 index 0000000000000000000000000000000000000000..843e9a644835727c8d45e662fb3372e6554a741d --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierReconciliationConditionsController.java @@ -0,0 +1,22 @@ +package com.fhs.supplier.controller; + +import com.fhs.supplier.po.SupplierReconciliationConditionsPO; +import com.fhs.supplier.vo.SupplierReconciliationConditionsVO; +import org.springframework.web.bind.annotation.*; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; + +/** + * 供应商对账条件配置(SupplierReconciliationConditions)表控制层 + * + * @author wanglei + * @since 2022-06-06 09:43:27 + */ + +@RestController +@Api(tags={"供应商对账条件配置"}) +@RequestMapping("/ms/supplierReconciliationConditions") +public class SupplierReconciliationConditionsController extends ModelSuperController { + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierSupplierController.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierSupplierController.java new file mode 100644 index 0000000000000000000000000000000000000000..bcaf2f988557c79e512f054b10101c7636f982f5 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/controller/SupplierSupplierController.java @@ -0,0 +1,22 @@ +package com.fhs.supplier.controller; + +import com.fhs.supplier.po.SupplierSupplierPO; +import com.fhs.supplier.vo.SupplierSupplierVO; +import org.springframework.web.bind.annotation.*; +import com.fhs.module.base.controller.ModelSuperController; +import io.swagger.annotations.Api; + +/** + * 供应商(SupplierSupplier)表控制层 + * + * @author liangxiaotao + * @since 2022-05-31 14:14:53 + */ + +@RestController +@Api(tags={"供应商"}) +@RequestMapping("/ms/supplierSupplier") +public class SupplierSupplierController extends ModelSuperController { + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierOrderPartyMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierOrderPartyMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..3c8019fe79146f4e7215067627eb9d2e10882a50 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierOrderPartyMapper.java @@ -0,0 +1,16 @@ +package com.fhs.supplier.mapper; + +import com.fhs.supplier.po.SupplierOrderPartyPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 订单方资料(SupplierOrderParty)表数据库访问层 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ +@Repository +public interface SupplierOrderPartyMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierOrderStatusMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierOrderStatusMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..b793061bcc35584e52367e4100feb4a4308b5cc0 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierOrderStatusMapper.java @@ -0,0 +1,16 @@ +package com.fhs.supplier.mapper; + +import com.fhs.supplier.po.SupplierOrderStatusPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 订单方状态管理(SupplierOrderStatus)表数据库访问层 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ +@Repository +public interface SupplierOrderStatusMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierPaymentConditionsMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierPaymentConditionsMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..7ae887f43c0fd85f0699125d3cea704a8ef4f96d --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierPaymentConditionsMapper.java @@ -0,0 +1,16 @@ +package com.fhs.supplier.mapper; + +import com.fhs.supplier.po.SupplierPaymentConditionsPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 供应商付款条件(SupplierPaymentConditions)表数据库访问层 + * + * @author liangxiaotao + * @since 2022-06-06 11:09:11 + */ +@Repository +public interface SupplierPaymentConditionsMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierReconciliationConditionsMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierReconciliationConditionsMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..443b362c7ec2fafbc9af7c5feda3c2774566f1fc --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierReconciliationConditionsMapper.java @@ -0,0 +1,16 @@ +package com.fhs.supplier.mapper; + +import com.fhs.supplier.po.SupplierReconciliationConditionsPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 供应商对账条件配置(SupplierReconciliationConditions)表数据库访问层 + * + * @author wanglei + * @since 2022-06-06 09:43:27 + */ +@Repository +public interface SupplierReconciliationConditionsMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierSupplierMapper.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierSupplierMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..643950a55959e11901fa3a0a7827498340ddc527 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/mapper/SupplierSupplierMapper.java @@ -0,0 +1,16 @@ +package com.fhs.supplier.mapper; + +import com.fhs.supplier.po.SupplierSupplierPO; +import com.fhs.core.base.mapper.FhsBaseMapper; +import org.springframework.stereotype.Repository; + +/** + * 供应商(SupplierSupplier)表数据库访问层 + * + * @author liangxiaotao + * @since 2022-05-31 14:14:59 + */ +@Repository +public interface SupplierSupplierMapper extends FhsBaseMapper { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierOrderPartyPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierOrderPartyPO.java new file mode 100644 index 0000000000000000000000000000000000000000..4d4b00dd829bf9ff4b2fbf40c0298191d8fc9863 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierOrderPartyPO.java @@ -0,0 +1,150 @@ +package com.fhs.supplier.po; + +import java.io.Serializable; +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.*; +import javax.validation.constraints.*; + +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import org.hibernate.validator.constraints.Length; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 订单方资料(SupplierOrderParty)实体类 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_supplier_order_party") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="SupplierOrderPartyPO",description ="订单方资料") +public class SupplierOrderPartyPO extends BasePO { + + private static final long serialVersionUID = -72165279964146526L; + + @TableId(value = "id", type = IdType.NONE) + @NotNull(message = "id字段不可为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 订单方名称 + */ + @Length(message = "订单方名称字段的长度最大为128", groups = {Add.class, Update.class}, max = 128) + @TableField("name") + @ApiModelProperty(value = "订单方名称") + private String name; + + /** + * 订单方代码 + */ + @Length(message = "订单方代码字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("order_party_code") + @ApiModelProperty(value = "订单方代码") + private String orderPartyCode; + + /** + * 合同编号 + */ + @TableField("contract_code") + @ApiModelProperty(value = "合同编号") + private Long contractCode; + + /** + * 所属供应商 + */ + @TableField("supplier_id") + @ApiModelProperty(value = "所属供应商") + @Trans(type = TransType.RPC,targetClassName = "com.fhs.supplier.po.SupplierSupplierPO", alias = "supplierCode", fields = "supplierCode", serviceName = "basic", dataSource = "basic") + private Integer supplierId; + + /** + * 订单方状态（0合作中1暂停合作2终止合作） + */ + @TableField("status") + @ApiModelProperty(value = "订单方状态（0合作中1暂停合作2终止合作）") + @Trans(type = TransType.DICTIONARY,key = "status") + private Integer status; + + /** + * 合作方式（0经销1代理2） + */ + @TableField("cooperation_ways") + @ApiModelProperty(value = "合作方式（0经销1代理2）") + @Trans(type = TransType.DICTIONARY,key = "cooperationWays") + private Integer cooperationWays; + + /** + * 所属大类（0烟1酒2茶叶） + */ + @TableField("category_id") + @ApiModelProperty(value = "所属大类（0烟1酒2茶叶）") + @Trans(type = TransType.DICTIONARY,key = "categoryId") + private Integer categoryId; + + /** + * 负责人 + */ + @TableField("principal_id") + @ApiModelProperty(value = "负责人") + @Trans(type = TransType.RPC,targetClassName = "com.fhs.basics.po.UcenterMsUserPO", alias = "principalId", fields = "userName", serviceName = "basic", dataSource = "basic") + private Long principalId; + + /** + * 所属部门 + */ + @TableField("org_id") + @ApiModelProperty(value = "所属部门") + @Trans(type = TransType.RPC,targetClassName = "com.fhs.basics.po.UcenterMsOrganizationPO", alias = "orgId", fields = "name", serviceName = "basic", dataSource = "basic") + private Long orgId; + + /** + * 默认仓储（0唯客润1胖东来2华润） + */ + @TableField("default_storage") + @ApiModelProperty(value = "默认仓储（0唯客润1胖东来2华润）") + @Trans(type = TransType.DICTIONARY,key = "defaultStorage") + private Integer defaultStorage; + + /** + * 默认仓位（0常温仓1低温仓） + */ + @TableField("default_location") + @ApiModelProperty(value = "默认仓位（0常温仓1低温仓）") + @Trans(type = TransType.DICTIONARY,key = "defaultLocation") + private Integer defaultLocation; + + /** + * 结算模式（0按对账结算1按付款结算） + */ + @TableField("settlement_pattern") + @ApiModelProperty(value = "结算模式（0按对账结算1按付款结算）") + @Trans(type = TransType.DICTIONARY,key = "settlementPattern") + private Integer settlementPattern; + + /** + * 付款条件ID + */ + @TableField("payment_conditions") + @ApiModelProperty(value = "付款条件ID") + @Trans(type = TransType.RPC,targetClassName = "com.fhs.supplier.po.SupplierPaymentConditionsPO", alias = "paymentConditions", fields = "name", serviceName = "basic", dataSource = "basic") + private Integer paymentConditions; + + /** + * 对账条件ID + */ + @TableField("reconciliation_conditions") + @ApiModelProperty(value = "对账条件ID") + @Trans(type = TransType.RPC,targetClassName = "com.fhs.supplier.po.SupplierReconciliationConditionsPO", alias = "reconciliationConditions", fields = "name", serviceName = "basic", dataSource = "basic") + private Integer reconciliationConditions; + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierOrderStatusPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierOrderStatusPO.java new file mode 100644 index 0000000000000000000000000000000000000000..34286b474a6eb725188ece3cdddc02c28a5ea646 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierOrderStatusPO.java @@ -0,0 +1,74 @@ +package com.fhs.supplier.po; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.*; +import javax.validation.constraints.*; +import com.fhs.core.jsonfilter.anno.AutoArray; +import com.fhs.core.jsonfilter.serializer.Str2ArrayValueSerializer; +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import org.hibernate.validator.constraints.Length; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 订单方状态管理(SupplierOrderStatus)实体类 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_supplier_order_status") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="SupplierOrderStatusPO",description ="订单方状态管理") +public class SupplierOrderStatusPO extends BasePO { + + private static final long serialVersionUID = 462682198223189756L; + + @TableId(value = "id", type = IdType.NONE) + @NotNull(message = "id字段不可为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 代码 + */ + @Length(message = "代码字段的长度最大为8", groups = {Add.class, Update.class}, max = 8) + @TableField("order_status_code") + @ApiModelProperty(value = "代码") + private String orderStatusCode; + + /** + * 名称 + */ + @Length(message = "名称字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("name") + @ApiModelProperty(value = "名称") + private String name; + + /** + * 是否启用（0否1是） + */ + @TableField("is_enable") + @ApiModelProperty(value = "是否启用（0否1是）") + @Trans(type = TransType.DICTIONARY,key = "yesOrNo") + private Integer isEnable; + + /** + * 业务控制（0允许采购订货1允许采购收货2允许采购退货3允许采购退货出货） + */ + @Length(message = "业务控制（0允许采购订货1允许采购收货2允许采购退货3允许采购退货出货）字段的长度最大为20", groups = {Add.class, Update.class}, max = 20) + @TableField("business_control") + @ApiModelProperty(value = "业务控制（0允许采购订货1允许采购收货2允许采购退货3允许采购退货出货）") + @Trans(type = TransType.DICTIONARY,key = "businessControl") + @AutoArray + @JSONField(serializeUsing = Str2ArrayValueSerializer.class) + private String businessControl; +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierPaymentConditionsPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierPaymentConditionsPO.java new file mode 100644 index 0000000000000000000000000000000000000000..5ec1bbc5bc73c51a39902e7d04756944fbbd4c05 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierPaymentConditionsPO.java @@ -0,0 +1,94 @@ +package com.fhs.supplier.po; + +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.*; +import javax.validation.constraints.*; + +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import org.hibernate.validator.constraints.Length; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 供应商付款条件(SupplierPaymentConditions)实体类 + * + * @author liangxiaotao + * @since 2022-06-06 11:09:11 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_supplier_payment_conditions") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="SupplierPaymentConditionsPO",description ="供应商付款条件") +public class SupplierPaymentConditionsPO extends BasePO { + + private static final long serialVersionUID = 866377902330210223L; + + @TableId(value = "id", type = IdType.AUTO) + @NotNull(message = "id字段不可为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 付款条件代码 + */ + @Length(message = "付款条件代码字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("conditions_code") + @ApiModelProperty(value = "付款条件代码") + private String conditionsCode; + + /** + * 付款条件名称 + */ + @Length(message = "付款条件名称字段的长度最大为128", groups = {Add.class, Update.class}, max = 128) + @TableField("name") + @ApiModelProperty(value = "付款条件名称") + private String name; + + /** + * 说明 + */ + @Length(message = "说明字段的长度最大为256", groups = {Add.class, Update.class}, max = 256) + @TableField("remark") + @ApiModelProperty(value = "说明") + private String remark; + + /** + * 付款天数 + */ + @TableField("days") + @ApiModelProperty(value = "付款天数") + private Integer days; + + /** + * 付款日期基数（0结转自然周1结转自然半月2结转自然月3固定日4无） + */ + @TableField("date_base") + @Trans(type= TransType.DICTIONARY,key = "supplierPaymentDateBase") + @ApiModelProperty(value = "付款日期基数（0结转自然周1结转自然半月2结转自然月3固定日4无）") + private Integer dateBase; + + /** + * 固定日天数 + */ + @TableField("date_base_day") + @ApiModelProperty(value = "固定日天数") + private Integer dateBaseDay; + + /** + * 付款日期基数缺省值（0发生日期1开票日期） + */ + @TableField("date_base_omit") + @Trans(type= TransType.DICTIONARY,key = "supplierPaymentDateBaseOmit") + @ApiModelProperty(value = "付款日期基数缺省值（0发生日期1开票日期）") + private Integer dateBaseOmit; + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierReconciliationConditionsPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierReconciliationConditionsPO.java new file mode 100644 index 0000000000000000000000000000000000000000..74c992dd884786968a1c5a8c03e589c475b0c3f2 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierReconciliationConditionsPO.java @@ -0,0 +1,88 @@ +package com.fhs.supplier.po; + +import java.io.Serializable; +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.*; +import javax.validation.constraints.*; + +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import org.hibernate.validator.constraints.Length; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 供应商对账条件配置(SupplierReconciliationConditions)实体类 + * + * @author wanglei + * @since 2022-06-06 09:43:27 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_supplier_reconciliation_conditions") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="SupplierReconciliationConditionsPO",description ="供应商对账条件配置") +public class SupplierReconciliationConditionsPO extends BasePO { + + private static final long serialVersionUID = 753876570499997481L; + + @TableId(value = "id", type = IdType.AUTO) + @NotNull(message = "id字段不可为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "id") + private Integer id; + + /** + * 对账条件代码 + */ + @Length(message = "对账条件代码字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("conditions_code") + @ApiModelProperty(value = "对账条件代码") + private String conditionsCode; + + /** + * 对账条件名称 + */ + @Length(message = "对账条件名称字段的长度最大为128", groups = {Add.class, Update.class}, max = 128) + @TableField("name") + @ApiModelProperty(value = "对账条件名称") + private String name; + + /** + * 说明 + */ + @Length(message = "说明字段的长度最大为256", groups = {Add.class, Update.class}, max = 256) + @TableField("remark") + @ApiModelProperty(value = "说明") + private String remark; + + /** + * 对账天数 + */ + @TableField("days") + @ApiModelProperty(value = "对账天数") + private Integer days; + + /** + * 对账日期基数（0自然周1自然半月2自然月3无） + */ + @TableField("date_base") + @Trans(type= TransType.DICTIONARY,key = "supplierReconciliationDateBase") + @ApiModelProperty(value = "对账日期基数（0自然周1自然半月2自然月3无）") + private Integer dateBase; + + /** + * 对账日期基数缺省值（0发生日期1创建日期2无） + */ + @TableField("date_base_omit") + @Trans(type= TransType.DICTIONARY,key = "supplierReconciliationDateBaseOmit") + @ApiModelProperty(value = "对账日期基数缺省值（0发生日期1创建日期2无）") + private Integer dateBaseOmit; + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierSupplierPO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierSupplierPO.java new file mode 100644 index 0000000000000000000000000000000000000000..13e3327ccf566286827cc891dbff9e0b027ca507 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/po/SupplierSupplierPO.java @@ -0,0 +1,219 @@ +package com.fhs.supplier.po; + +import java.io.Serializable; +import com.fhs.core.base.po.BasePO; +import com.fhs.core.base.valid.group.*; +import javax.validation.constraints.*; + +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import org.hibernate.validator.constraints.Length; +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 供应商(SupplierSupplier)实体类 + * + * @author liangxiaotao + * @since 2022-05-31 14:15:01 + */ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_supplier_supplier") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="SupplierSupplierPO",description ="供应商") +public class SupplierSupplierPO extends BasePO { + + private static final long serialVersionUID = -80514871843441784L; + + @TableId(value = "id", type = IdType.AUTO) + @NotNull(message = "供应商代码字段不可为空", groups = {Update.class, Delete.class}) + @ApiModelProperty(value = "供应商代码") + private Integer id; + + /** + * 供应商名称 + */ + @Length(message = "供应商名称字段的长度最大为128", groups = {Add.class, Update.class}, max = 128) + @TableField("name") + @ApiModelProperty(value = "供应商名称") + private String name; + + /** + * 供应商编码 + */ + @Length(message = "供应商编码字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("supplier_code") + @ApiModelProperty(value = "供应商编码") + private String supplierCode; + + /** + * 简称 + */ + @Length(message = "简称字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("short_name") + @ApiModelProperty(value = "简称") + private String shortName; + + /** + * 供应商状态 + */ + @TableField("status") + @ApiModelProperty(value = "供应商状态") + @Trans(type = TransType.DICTIONARY,key = "supplierState") + private Integer status; + + /** + * 进项税率 + */ + @TableField("rate") + @ApiModelProperty(value = "进项税率") + @Trans(type = TransType.DICTIONARY,key = "InputTaxRate") + private Integer rate; + + /** + * 供应商等级 + */ + @TableField("level") + @ApiModelProperty(value = "供应商等级") + @Trans(type = TransType.DICTIONARY,key = "supplierLevel") + private Integer level; + + /** + * 供应商类型 + */ + @TableField("supplier_type") + @ApiModelProperty(value = "供应商类型") + @Trans(type = TransType.DICTIONARY,key = "supplierType") + private Integer supplierType; + + /** + * 联系人 + */ + @Length(message = "联系人字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("contact") + @ApiModelProperty(value = "联系人") + private String contact; + + /** + * 联系人电话 + */ + @Length(message = "联系人电话字段的长度最大为20", groups = {Add.class, Update.class}, max = 20) + @TableField("contact_mobile") + @ApiModelProperty(value = "联系人电话") + private String contactMobile; + + /** + * 企业性质 + */ + @TableField("nature") + @ApiModelProperty(value = "企业性质") + private Integer nature; + + /** + * 企业法人 + */ + @Length(message = "企业法人字段的长度最大为32", groups = {Add.class, Update.class}, max = 32) + @TableField("legal_person") + @ApiModelProperty(value = "企业法人") + private String legalPerson; + + /** + * 法人身份证号 + */ + @Length(message = "法人身份证号字段的长度最大为20", groups = {Add.class, Update.class}, max = 20) + @TableField("id_no") + @ApiModelProperty(value = "法人身份证号") + private String idNo; + + /** + * 企业类型 + */ + @TableField("company_type") + @ApiModelProperty(value = "企业类型") + @Trans(type = TransType.DICTIONARY,key = "enterpriseType") + private Integer companyType; + + /** + * 公司电话 + */ + @Length(message = "公司电话字段的长度最大为20", groups = {Add.class, Update.class}, max = 20) + @TableField("company_mobile") + @ApiModelProperty(value = "公司电话") + private String companyMobile; + + /** + * 注册资金 + */ + @TableField("registered_capital") + @ApiModelProperty(value = "注册资金") + private Integer registeredCapital; + + /** + * 供应商邮箱 + */ + @Length(message = "供应商邮箱字段的长度最大为256", groups = {Add.class, Update.class}, max = 256) + @TableField("email") + @ApiModelProperty(value = "供应商邮箱") + private String email; + + /** + * 省份id + */ + @TableField("province") + @ApiModelProperty(value = "省份id") + private Integer province; + + /** + * 市id + */ + @TableField("city") + @ApiModelProperty(value = "市id") + private Integer city; + + /** + * 区县 id + */ + @TableField("area") + @ApiModelProperty(value = "区县 id") + private Integer area; + + /** + * 经营品牌 + */ + @Length(message = "经营品牌字段的长度最大为128", groups = {Add.class, Update.class}, max = 128) + @TableField("brand") + @ApiModelProperty(value = "经营品牌") + private String brand; + + /** + * 地址 + */ + @Length(message = "地址字段的长度最大为256", groups = {Add.class, Update.class}, max = 256) + @TableField("address") + @ApiModelProperty(value = "地址") + private String address; + + /** + * 营业执照id + */ + @TableField("business_license") + @ApiModelProperty(value = "营业执照id") + private Long businessLicense; + + /** + * 收款账号 + */ + @Length(message = "收款账号字段的长度最大为64", groups = {Add.class, Update.class}, max = 64) + @TableField("account_num") + @ApiModelProperty(value = "收款账号") + private String accountNum; + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierOrderPartyService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierOrderPartyService.java new file mode 100644 index 0000000000000000000000000000000000000000..a5aadb821c5df23f928c6b789e83727c50c31f6a --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierOrderPartyService.java @@ -0,0 +1,17 @@ +package com.fhs.supplier.service; + +import com.fhs.supplier.po.SupplierOrderPartyPO; +import com.fhs.supplier.vo.SupplierOrderPartyVO; +import com.fhs.core.base.service.BaseService; + +/** + * 订单方资料(SupplierOrderParty)}表服务接口 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ +public interface SupplierOrderPartyService extends BaseService{ + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierOrderStatusService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierOrderStatusService.java new file mode 100644 index 0000000000000000000000000000000000000000..d148b4914be140e0a970d0c4f31f7815216151e1 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierOrderStatusService.java @@ -0,0 +1,17 @@ +package com.fhs.supplier.service; + +import com.fhs.supplier.po.SupplierOrderStatusPO; +import com.fhs.supplier.vo.SupplierOrderStatusVO; +import com.fhs.core.base.service.BaseService; + +/** + * 订单方状态管理(SupplierOrderStatus)}表服务接口 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ +public interface SupplierOrderStatusService extends BaseService{ + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierPaymentConditionsService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierPaymentConditionsService.java new file mode 100644 index 0000000000000000000000000000000000000000..247a2f8aab555655e86e2ebfab2e285a478a9805 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierPaymentConditionsService.java @@ -0,0 +1,17 @@ +package com.fhs.supplier.service; + +import com.fhs.supplier.po.SupplierPaymentConditionsPO; +import com.fhs.supplier.vo.SupplierPaymentConditionsVO; +import com.fhs.core.base.service.BaseService; + +/** + * 供应商付款条件(SupplierPaymentConditions)}表服务接口 + * + * @author liangxiaotao + * @since 2022-06-06 11:09:09 + */ +public interface SupplierPaymentConditionsService extends BaseService{ + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierReconciliationConditionsService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierReconciliationConditionsService.java new file mode 100644 index 0000000000000000000000000000000000000000..7e60cf29f274ebb8fef1badb1020415c9b701378 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierReconciliationConditionsService.java @@ -0,0 +1,17 @@ +package com.fhs.supplier.service; + +import com.fhs.supplier.po.SupplierReconciliationConditionsPO; +import com.fhs.supplier.vo.SupplierReconciliationConditionsVO; +import com.fhs.core.base.service.BaseService; + +/** + * 供应商对账条件配置(SupplierReconciliationConditions)}表服务接口 + * + * @author wanglei + * @since 2022-06-06 09:43:27 + */ +public interface SupplierReconciliationConditionsService extends BaseService{ + + + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierSupplierService.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierSupplierService.java new file mode 100644 index 0000000000000000000000000000000000000000..7b716b3ded7345b79c0a6d5a00f83c684f8d5da2 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/SupplierSupplierService.java @@ -0,0 +1,15 @@ +package com.fhs.supplier.service; + +import com.fhs.supplier.po.SupplierSupplierPO; +import com.fhs.supplier.vo.SupplierSupplierVO; +import com.fhs.core.base.service.BaseService; + +/** + * 供应商(SupplierSupplier)}表服务接口 + * + * @author wanglei + * @since 2022-05-31 14:14:47 + */ +public interface SupplierSupplierService extends BaseService{ + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierOrderPartyServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierOrderPartyServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..c3cb859c37db7ddce3ea8f637f06b14c9c4e55e2 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierOrderPartyServiceImpl.java @@ -0,0 +1,36 @@ +package com.fhs.supplier.service.impl; + +import com.fhs.basics.context.UserContext; +import com.fhs.common.utils.StringUtils; +import com.fhs.supplier.vo.SupplierOrderPartyVO; +import com.fhs.supplier.po.SupplierOrderPartyPO; +import com.fhs.supplier.service.SupplierOrderPartyService; +import org.springframework.stereotype.Service; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.base.service.impl.BaseServiceImpl; +import java.util.ArrayList; +import java.util.List; + +/** + * 订单方资料(SupplierOrderParty)表服务实现类 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ +@Service +@Namespace("supplier_order_party") +public class SupplierOrderPartyServiceImpl extends BaseServiceImpl implements SupplierOrderPartyService { + @Override + public int insert(SupplierOrderPartyPO entity) { + entity.setPrincipalId(UserContext.getSessionuser().getUserId()); + entity.setOrgId(Long.valueOf(UserContext.getSessionuser().getOrganizationId())); + int insert = super.insert(entity); + Integer id = entity.getId(); + String code = StringUtils.formatCountWith0("","%06d",id); + entity.setOrderPartyCode(code); + List list = new ArrayList<>(); + list.add(entity); + this.batchUpdate(list); + return insert; + } +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierOrderStatusServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierOrderStatusServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..69cdbd77853ac18831edc3f878db5e72aecc0894 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierOrderStatusServiceImpl.java @@ -0,0 +1,22 @@ +package com.fhs.supplier.service.impl; + + +import com.fhs.supplier.vo.SupplierOrderStatusVO; +import com.fhs.supplier.po.SupplierOrderStatusPO; +import com.fhs.supplier.service.SupplierOrderStatusService; +import org.springframework.stereotype.Service; +import com.fhs.core.db.ds.DataSource; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.base.service.impl.BaseServiceImpl; + +/** + * 订单方状态管理(SupplierOrderStatus)表服务实现类 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ +@Service +@Namespace("supplier_order_status") +public class SupplierOrderStatusServiceImpl extends BaseServiceImpl implements SupplierOrderStatusService { + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierPaymentConditionsServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierPaymentConditionsServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..1c28e9e94837de2f7ce6d6918d2ba6ce11d8f735 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierPaymentConditionsServiceImpl.java @@ -0,0 +1,31 @@ +package com.fhs.supplier.service.impl; + + +import com.fhs.common.utils.StringUtils; +import com.fhs.supplier.constant.SupplierConstant; +import com.fhs.supplier.vo.SupplierPaymentConditionsVO; +import com.fhs.supplier.po.SupplierPaymentConditionsPO; +import com.fhs.supplier.service.SupplierPaymentConditionsService; +import org.springframework.stereotype.Service; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.base.service.impl.BaseServiceImpl; + +/** + * 供应商付款条件(SupplierPaymentConditions)表服务实现类 + * + * @author liangxiaotao + * @since 2022-06-06 11:09:09 + */ +@Service +@Namespace("supplier_payment_conditions") +public class SupplierPaymentConditionsServiceImpl extends BaseServiceImpl implements SupplierPaymentConditionsService { + @Override + public int insert(SupplierPaymentConditionsPO entity) { + int result = super.insert(entity); + entity.setConditionsCode(SupplierConstant.PAYMENT_PRE + StringUtils.formatCountWith0("", + "%06d",entity.getId())); + super.updateById(entity); + return result; + } + +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierReconciliationConditionsServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierReconciliationConditionsServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..ab02afbfd520fec03937677dfb01e5738a84439c --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierReconciliationConditionsServiceImpl.java @@ -0,0 +1,30 @@ +package com.fhs.supplier.service.impl; + + +import com.fhs.common.utils.StringUtils; +import com.fhs.supplier.constant.SupplierConstant; +import com.fhs.supplier.vo.SupplierReconciliationConditionsVO; +import com.fhs.supplier.po.SupplierReconciliationConditionsPO; +import com.fhs.supplier.service.SupplierReconciliationConditionsService; +import org.springframework.stereotype.Service; +import com.fhs.core.db.ds.DataSource; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.base.service.impl.BaseServiceImpl; + +/** + * 供应商对账条件配置(SupplierReconciliationConditions)表服务实现类 + * + * @author wanglei + * @since 2022-06-06 09:43:27 + */ +@Service +@Namespace("supplier_reconciliation_conditions") +public class SupplierReconciliationConditionsServiceImpl extends BaseServiceImpl implements SupplierReconciliationConditionsService { + @Override + public int insert(SupplierReconciliationConditionsPO entity) { + int result = super.insert(entity); + entity.setConditionsCode(SupplierConstant.RECONCILIATIONC_PRE + StringUtils.formatCountWith0("", + "%06d",entity.getId())); + return result; + } +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierSupplierServiceImpl.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierSupplierServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..925b5113e9a704adc257033a5ea40016d96acf60 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/service/impl/SupplierSupplierServiceImpl.java @@ -0,0 +1,37 @@ +package com.fhs.supplier.service.impl; + + +import com.fhs.common.utils.StringUtils; +import com.fhs.supplier.vo.SupplierSupplierVO; +import com.fhs.supplier.po.SupplierSupplierPO; +import com.fhs.supplier.service.SupplierSupplierService; +import org.springframework.stereotype.Service; +import com.fhs.core.db.ds.DataSource; +import com.fhs.core.cache.annotation.Namespace; +import com.fhs.core.base.service.impl.BaseServiceImpl; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * 供应商(SupplierSupplier)表服务实现类 + * + * @author liangxiaotao + * @since 2022-05-31 14:14:48 + */ +@Service +@Namespace("supplier_supplier") +public class SupplierSupplierServiceImpl extends BaseServiceImpl implements SupplierSupplierService { + @Override + public int insert(SupplierSupplierPO entity) { + int insert = super.insert(entity); + Integer id = entity.getId(); + String code = StringUtils.formatCountWith0("","%06d",id); + entity.setSupplierCode(code); + List list = new ArrayList<>(); + list.add(entity); + this.batchUpdate(list); + return insert; + } +} diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierOrderPartyVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierOrderPartyVO.java new file mode 100644 index 0000000000000000000000000000000000000000..5ab5950920cb967e92735252017fcdf336c74cb2 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierOrderPartyVO.java @@ -0,0 +1,23 @@ +package com.fhs.supplier.vo; + + +import com.fhs.supplier.po.SupplierOrderPartyPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import lombok.*; + +/** + * 订单方资料(SupplierOrderParty)实体类 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="订单方资料",description ="订单方资料") +public class SupplierOrderPartyVO extends SupplierOrderPartyPO implements VO { + + } + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierOrderStatusVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierOrderStatusVO.java new file mode 100644 index 0000000000000000000000000000000000000000..964632dc28c03680fd553afc8d2e9af994b7059e --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierOrderStatusVO.java @@ -0,0 +1,23 @@ +package com.fhs.supplier.vo; + + +import com.fhs.supplier.po.SupplierOrderStatusPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import lombok.*; + +/** + * 订单方状态管理(SupplierOrderStatus)实体类 + * + * @author liangxiaotao + * @since 2022-06-01 16:50:55 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="订单方状态管理",description ="订单方状态管理") +public class SupplierOrderStatusVO extends SupplierOrderStatusPO implements VO { + + } + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierPaymentConditionsVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierPaymentConditionsVO.java new file mode 100644 index 0000000000000000000000000000000000000000..eb96bb3ee7ce20b3f68158b7c6d4a5e069a7f540 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierPaymentConditionsVO.java @@ -0,0 +1,23 @@ +package com.fhs.supplier.vo; + + +import com.fhs.supplier.po.SupplierPaymentConditionsPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import lombok.*; + +/** + * 供应商付款条件(SupplierPaymentConditions)实体类 + * + * @author liangxiaotao + * @since 2022-06-06 11:09:11 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="供应商付款条件",description ="供应商付款条件") +public class SupplierPaymentConditionsVO extends SupplierPaymentConditionsPO implements VO { + + } + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierReconciliationConditionsVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierReconciliationConditionsVO.java new file mode 100644 index 0000000000000000000000000000000000000000..5a8ecdf80b340b87b2bb30ae84eef330a436543a --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierReconciliationConditionsVO.java @@ -0,0 +1,23 @@ +package com.fhs.supplier.vo; + + +import com.fhs.supplier.po.SupplierReconciliationConditionsPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import lombok.*; + +/** + * 供应商对账条件配置(SupplierReconciliationConditions)实体类 + * + * @author wanglei + * @since 2022-06-06 09:43:27 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="供应商对账条件配置",description ="供应商对账条件配置") +public class SupplierReconciliationConditionsVO extends SupplierReconciliationConditionsPO implements VO { + + } + diff --git a/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierSupplierVO.java b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierSupplierVO.java new file mode 100644 index 0000000000000000000000000000000000000000..0e7f93e5d025c18ce9cb799d62f1a8ce41e59d32 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/java/com/fhs/supplier/vo/SupplierSupplierVO.java @@ -0,0 +1,49 @@ +package com.fhs.supplier.vo; + + +import com.fhs.supplier.po.SupplierSupplierPO; +import com.fhs.core.trans.vo.VO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 供应商(SupplierSupplier)实体类 + * + * @author liangxiaotao + * @since 2022-05-31 14:14:57 + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value ="供应商",description ="供应商") +public class SupplierSupplierVO extends SupplierSupplierPO implements VO { + + @ApiModelProperty(value = "地址") + private String[]geographicalPosition; + + public String[] getGeographicalPosition() { + + if(this.getProvince() == null || this.getCity() == null || this.getArea() == null){ + return new String[]{}; + }else{ + this.geographicalPosition = new String[3]; + this.geographicalPosition[0] = this.getProvince().toString(); + this.geographicalPosition[1] = this.getCity().toString(); + this.geographicalPosition[2] = this.getArea().toString(); + return geographicalPosition; + } + } + + public void setGeographicalPosition(String[] geographicalPosition) { + if(geographicalPosition == null || geographicalPosition.length == 0){ + return; + } + this.geographicalPosition = geographicalPosition; + this.setProvince(Integer.valueOf(this.geographicalPosition[0])); + this.setCity(Integer.valueOf(this.geographicalPosition[1])); + this.setArea(Integer.valueOf(this.geographicalPosition[2])); + } +} + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/agreement_agreement.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/agreement_agreement.xml new file mode 100644 index 0000000000000000000000000000000000000000..d76c0e2e6525dfc10ab5a1861d05ef88fbc7645f --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/agreement_agreement.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/agreement_goods_sett.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/agreement_goods_sett.xml new file mode 100644 index 0000000000000000000000000000000000000000..fc70e838faf3957ea8c401a82e08577255fe756a --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/agreement_goods_sett.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/fee_plan.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/fee_plan.xml new file mode 100644 index 0000000000000000000000000000000000000000..cad3061e129d6002d130e70c932a332e9bc78058 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/fee_plan.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/fee_project.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/fee_project.xml new file mode 100644 index 0000000000000000000000000000000000000000..a05e0623feb86b83f0db61348e79ef0e6da2f383 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/fee_project.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_order_party.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_order_party.xml new file mode 100644 index 0000000000000000000000000000000000000000..a76afcfd2f881428bee3ca3df61995cc3e1a026f --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_order_party.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_order_status.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_order_status.xml new file mode 100644 index 0000000000000000000000000000000000000000..6e34a108adac613fa5faefe6002fd3e16bbb7ece --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_order_status.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_payment_conditions.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_payment_conditions.xml new file mode 100644 index 0000000000000000000000000000000000000000..c27184ddab3a01b1d6a233f91c06033542f9c4fe --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_payment_conditions.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_reconciliation_conditions.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_reconciliation_conditions.xml new file mode 100644 index 0000000000000000000000000000000000000000..8dc06486465e888ddaa2abf5008f16e93ca9d907 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_reconciliation_conditions.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_supplier.xml b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_supplier.xml new file mode 100644 index 0000000000000000000000000000000000000000..c4ca5c25c00a1c50eab12012141e1f9bde3dd6d6 --- /dev/null +++ b/fhs_app/fhs_app_all_in_one/src/main/resources/mapper/supplier_supplier.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/fhs_app/fhs_app_basics/pom.xml b/fhs_app/fhs_app_basics/pom.xml index fd2a2d8d8cde08949ec799a80f99380016f1f222..88df590c995e7f658a3f142f433671eefdfe66de 100644 --- a/fhs_app/fhs_app_basics/pom.xml +++ b/fhs_app/fhs_app_basics/pom.xml @@ -6,7 +6,7 @@ fhs_app com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_app/fhs_app_demo/pom.xml b/fhs_app/fhs_app_demo/pom.xml index 180a3fc6f71ea8b2863c913f8a8d2288ff05278c..552c657569e9a56561cc00a650eb2a07a2074c69 100644 --- a/fhs_app/fhs_app_demo/pom.xml +++ b/fhs_app/fhs_app_demo/pom.xml @@ -6,7 +6,7 @@ fhs_app com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 diff --git a/fhs_app/pom.xml b/fhs_app/pom.xml index 9576f33e92cb237778411c007dd1dfbcbdd14db3..0672f2ef03c79830b59598c38ade91578122bea1 100644 --- a/fhs_app/pom.xml +++ b/fhs_app/pom.xml @@ -6,7 +6,7 @@ fhs_framework com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 @@ -25,7 +25,6 @@ org.springframework.boot spring-boot-maven-plugin - 2.6.2 true true diff --git a/fhs_common/pom.xml b/fhs_common/pom.xml index 3824f042ff9c5f80600bc962286f9321630069ed..283d08063f1aed1e82c879f4e17b07019fb25654 100644 --- a/fhs_common/pom.xml +++ b/fhs_common/pom.xml @@ -9,7 +9,7 @@ fhs_framework com.fhs-opensource 3.0.0 - + ../pom.xml com.fhs-opensource diff --git a/fhs_extends/fhs_api/pom.xml b/fhs_extends/fhs_api/pom.xml index 5fff883db19d424554cc3f07b21cc0710c46ed4c..270c56443984e50e1d888d10e304fd3495e9d986 100644 --- a/fhs_extends/fhs_api/pom.xml +++ b/fhs_extends/fhs_api/pom.xml @@ -6,7 +6,7 @@ fhs_extends com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_extends/fhs_base/fhs_base_other/pom.xml b/fhs_extends/fhs_base/fhs_base_other/pom.xml index a35fbcdcd0c7329d5a00df45766f25186bb77b85..8d646a83d9f65065094ee8af6932887655f97f58 100644 --- a/fhs_extends/fhs_base/fhs_base_other/pom.xml +++ b/fhs_extends/fhs_base/fhs_base_other/pom.xml @@ -6,7 +6,7 @@ fhs_base com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_extends/fhs_base/fhs_base_pojo/pom.xml b/fhs_extends/fhs_base/fhs_base_pojo/pom.xml index 64d17c8bd20a621b96e56f7639f9f6e22b177c23..bd63b5cb6dcb45aec34723fa0b108351a730d3f7 100644 --- a/fhs_extends/fhs_base/fhs_base_pojo/pom.xml +++ b/fhs_extends/fhs_base/fhs_base_pojo/pom.xml @@ -6,7 +6,7 @@ fhs_base com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 @@ -31,10 +31,10 @@ com.baomidou mybatis-plus-core - + com.fhs-opensource fhs_excel_anno diff --git a/fhs_extends/fhs_base/fhs_base_pojo/src/main/java/com/fhs/core/base/vo/QueryFilter.java b/fhs_extends/fhs_base/fhs_base_pojo/src/main/java/com/fhs/core/base/vo/QueryFilter.java index 402191c8ef3013ba85a19842e9deac044df62234..7797646a41019ddd331ed7ec8d14e6308b3b9ee9 100644 --- a/fhs_extends/fhs_base/fhs_base_pojo/src/main/java/com/fhs/core/base/vo/QueryFilter.java +++ b/fhs_extends/fhs_base/fhs_base_pojo/src/main/java/com/fhs/core/base/vo/QueryFilter.java @@ -281,7 +281,7 @@ public class QueryFilter { if (CheckUtils.isNullOrEmpty(queryField.getValue()) || "null".equals(ConverterUtils.toString(queryField.getValue()))) { return; } - String field = null; + String field = getField(queryField.getProperty(), currentModelClass); if (!StringUtils.isEmpty(queryField.getTarget()) ) { if(StringUtils.isEmpty(queryField.getField())){ throw new ParamsInValidException("当target不为空的时候field也一定不可以为空，字段:" + queryField.getProperty()); @@ -311,7 +311,6 @@ public class QueryFilter { queryWrapper.apply(sql); return; } - field = getField(queryField.getProperty(), currentModelClass); String operation = queryField.getOperation(); switch (operation) { diff --git a/fhs_extends/fhs_base/pom.xml b/fhs_extends/fhs_base/pom.xml index d2f986d32011effa53b13d616ff7d4ad400bc6c7..337f061c1020392e7f8737a0316292d9c9611eed 100644 --- a/fhs_extends/fhs_base/pom.xml +++ b/fhs_extends/fhs_base/pom.xml @@ -6,7 +6,7 @@ fhs_extends com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 pom diff --git a/fhs_extends/fhs_core/pom.xml b/fhs_extends/fhs_core/pom.xml index 69b911abcaa932f2d5b845a6db17eb22a4b5e343..d849202b7c7124887118fc56151cd2f4ca0e4268 100644 --- a/fhs_extends/fhs_core/pom.xml +++ b/fhs_extends/fhs_core/pom.xml @@ -6,7 +6,7 @@ fhs_extends com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 diff --git a/fhs_extends/fhs_excel/fhs_excel_anno/pom.xml b/fhs_extends/fhs_excel/fhs_excel_anno/pom.xml index c1537a3855f18af051b3c94beaaeb07ffd256922..02b0e2b5b62e6774bfa898eef18c338d8af77511 100644 --- a/fhs_extends/fhs_excel/fhs_excel_anno/pom.xml +++ b/fhs_extends/fhs_excel/fhs_excel_anno/pom.xml @@ -6,7 +6,7 @@ fhs_excel com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_extends/fhs_excel/fhs_excel_core/pom.xml b/fhs_extends/fhs_excel/fhs_excel_core/pom.xml index 460b639a9771911b2e32bd0581ab2a4cfe4768cc..f297a7cbd893416d22f37755b82eef167198d36e 100644 --- a/fhs_extends/fhs_excel/fhs_excel_core/pom.xml +++ b/fhs_extends/fhs_excel/fhs_excel_core/pom.xml @@ -6,7 +6,7 @@ fhs_excel com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_extends/fhs_excel/pom.xml b/fhs_extends/fhs_excel/pom.xml index 0563bbfd905bc1478e1136e61db840911a0b3717..af066c5942f98ef00ac9b136ef99d222fa6b9620 100644 --- a/fhs_extends/fhs_excel/pom.xml +++ b/fhs_extends/fhs_excel/pom.xml @@ -6,7 +6,7 @@ fhs_extends com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 pom diff --git a/fhs_extends/fhs_log/pom.xml b/fhs_extends/fhs_log/pom.xml index 5e64167b2b0575f7c9fd2a922e569221c7d94986..66a8e049cca9e599d37d68e29ef678f99da5cbcb 100644 --- a/fhs_extends/fhs_log/pom.xml +++ b/fhs_extends/fhs_log/pom.xml @@ -6,7 +6,7 @@ com.fhs-opensource fhs_extends 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_extends/fhs_pojo/pom.xml b/fhs_extends/fhs_pojo/pom.xml index 00c257c573c65f48b16fad63184072ff4272ebb7..5d9703d065866b8359b2f93c0254b938ddb279f4 100644 --- a/fhs_extends/fhs_pojo/pom.xml +++ b/fhs_extends/fhs_pojo/pom.xml @@ -6,7 +6,7 @@ fhs_extends com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_extends/pom.xml b/fhs_extends/pom.xml index 13313e25eee58b43c8ae3ab69493aebf4231e8dd..86d28fab9c16b4db6b6a734bcbf9feb24c5f26a9 100644 --- a/fhs_extends/pom.xml +++ b/fhs_extends/pom.xml @@ -6,7 +6,7 @@ fhs_framework com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 fhs_extends diff --git a/fhs_module/fhs_basics/fhs_basics_api/pom.xml b/fhs_module/fhs_basics/fhs_basics_api/pom.xml index 91bcbe2215cfb4d94076f99c122761e54a69b2c8..a4f4185c1759ffc935b99d32a473205e3cb81549 100644 --- a/fhs_module/fhs_basics/fhs_basics_api/pom.xml +++ b/fhs_module/fhs_basics/fhs_basics_api/pom.xml @@ -6,6 +6,7 @@ fhs_basics com.fhs-opensource 3.0.0 + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_module/fhs_basics/fhs_basics_service/pom.xml b/fhs_module/fhs_basics/fhs_basics_service/pom.xml index 1212b196be6f215909d3567fcac1e8c39a32b0bb..74f44cb03fcbf168a33535f55954a4c74f0963d8 100644 --- a/fhs_module/fhs_basics/fhs_basics_service/pom.xml +++ b/fhs_module/fhs_basics/fhs_basics_service/pom.xml @@ -6,7 +6,7 @@ fhs_basics com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_module/fhs_basics/fhs_basics_service/src/main/java/com/fhs/basics/controller/UcenterMsUserController.java b/fhs_module/fhs_basics/fhs_basics_service/src/main/java/com/fhs/basics/controller/UcenterMsUserController.java index 6a052ae231fa11496fd78080207ee87e307ab48c..7db005a0dadeeaf162507d9e6967d2142b275383 100644 --- a/fhs_module/fhs_basics/fhs_basics_service/src/main/java/com/fhs/basics/controller/UcenterMsUserController.java +++ b/fhs_module/fhs_basics/fhs_basics_service/src/main/java/com/fhs/basics/controller/UcenterMsUserController.java @@ -73,6 +73,7 @@ public class UcenterMsUserController extends ModelSuperController add(@RequestBody @Validated(Add.class) UcenterMsUserVO sysUser) { @@ -134,6 +135,7 @@ public class UcenterMsUserController extends ModelSuperController update(@RequestBody @Validated(Update.class) UcenterMsUserVO sysUser) { diff --git a/fhs_module/fhs_generate/pom.xml b/fhs_module/fhs_generate/pom.xml index 2f53b134f30dcda5377be5c4e46902fbcbf7f9bc..252744b8d126e9a08058ae6394fe6faeec15e973 100644 --- a/fhs_module/fhs_generate/pom.xml +++ b/fhs_module/fhs_generate/pom.xml @@ -6,7 +6,7 @@ fhs_module com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 diff --git a/fhs_module/fhs_module_base/pom.xml b/fhs_module/fhs_module_base/pom.xml index 42b2e5454e7a3b3d996a1fa092745ee9a1780af1..72c4188e067d18fe3f796065f7a5fefea4c773a8 100644 --- a/fhs_module/fhs_module_base/pom.xml +++ b/fhs_module/fhs_module_base/pom.xml @@ -6,7 +6,7 @@ fhs_module com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 3.0.0 diff --git a/fhs_module/pom.xml b/fhs_module/pom.xml index c6ae124d3b03036fb59760bf3c40df05db868e68..911b387a105f510fc1c56d4655a82f2dd2490373 100644 --- a/fhs_module/pom.xml +++ b/fhs_module/pom.xml @@ -6,7 +6,7 @@ fhs_framework com.fhs-opensource 3.0.0 - + ../pom.xml 4.0.0 pom diff --git a/fhs_spring_cloud/pom.xml b/fhs_spring_cloud/pom.xml index 27ad42ef196e34feb1a0d5a587109faab6f4dbe1..d4a776c6b10aac7d4280cf9c3f70367f2d18686f 100644 --- a/fhs_spring_cloud/pom.xml +++ b/fhs_spring_cloud/pom.xml @@ -6,7 +6,7 @@ fhs_framework com.fhs-opensource 3.0.0 - + ../pom.xml fhs_spring_cloud 4.0.0 diff --git a/pom.xml b/pom.xml index 9dd89d74715aa607424f1b58fd1b3dcde49d6e63..f9c60bf2bc686e8fdf230083f3f06d6020c5b12b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.fhs-opensource fhs_framework fhs framework开源版本3.0 - 3.0.0 + 3.4.2 pom 4.0.0 @@ -26,7 +26,7 @@ 2.5.16 3.0.4 3.1.0 - 4.0.0 + 3.4.2 1.2.83 1.27.0 1.5.10 @@ -56,11 +56,11 @@ ${fhs.easytrans.version} - + io.swagger diff --git a/vue_ui/src/lib/components/crud.vue b/vue_ui/src/lib/components/crud.vue index 4a4117d26ba509240d383daaf5f3386a0b44b688..7a10591fa8513abb48cc315a86701be6fae879e0 100644 --- a/vue_ui/src/lib/components/crud.vue +++ b/vue_ui/src/lib/components/crud.vue @@ -177,7 +177,6 @@ by wanglei :key="'operation' + index" align="center" :width="item.width" - :fixed="item.fixed" >