diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 3461802b..ff856e49 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -503,6 +503,12 @@ public class BmsSupplierController { } List userList = sysUserService.listByIds(otherUserIdSet); List sysUsers = userList.stream().map(SysUser::toSysUserVo).collect(Collectors.toList()); + + for (SysUserVo user : sysUsers) { + boolean isOther = userIds.stream().anyMatch(aa->aa.equals(user.getId())); + user.setSupplierMainFlag(isOther?0:1); + } + return R.ok(sysUsers); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java index c6686752..7a8f2a5f 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java @@ -109,6 +109,11 @@ public class BmsSupplierExcelBo { bo.setId(bmsSupplier.getId()); bo.setCustomerName(bmsSupplier.getName()); bo.setCustomerCode(bmsSupplier.getCode()); + bo.setIsSupplier(bmsSupplier.getSupplierFlag()); + bo.setSupplierInfoFlag(bmsSupplier.getSupplierInfoFlag()==null?0:bmsSupplier.getSupplierInfoFlag()); + bo.setSupplierTaxNumber(bmsSupplier.getSupplierTaxNumber()); + bo.setSupplierUser(bmsSupplier.getSupplierUser()); + bo.setSupplierLicenseImg(bmsSupplier.getSupplierLicenseImg()); if(bmsSupplier.getRegionFirstInfo()!=null) { BmsRegion firstRegion = (BmsRegion)bmsSupplier.getRegionFirstInfo(); bo.setFirstLevelSalesRegionName(firstRegion.getName()); diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 5da72878..802700bb 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -73,6 +73,9 @@ public class GoodsSku implements Serializable { @NotNull(message = "体积（m³）不能为空") private BigDecimal volume; + /** 净重 */ + private BigDecimal invUnitWeight; + /** 最低起批数(0->不限制) */ private Integer minPurchase; diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java index 987e9971..18e673ab 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java @@ -9,9 +9,11 @@ import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.TreeUtil; import com.qs.serve.modules.sys.entity.SysPost; +import com.qs.serve.modules.sys.entity.SysPostUser; import com.qs.serve.modules.sys.entity.vo.SysPostTreeVo; import com.qs.serve.modules.sys.service.SysDeptService; import com.qs.serve.modules.sys.service.SysPostService; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.tag.entity.vo.TagCategoryTreeVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,6 +36,7 @@ import java.util.stream.Collectors; public class SysPostController { private SysPostService sysPostService; + private SysPostUserService sysPostUserService; /** * 列表查询 @@ -43,6 +46,13 @@ public class SysPostController { @GetMapping("/tree") public R> getList(SysPost param){ List list = sysPostService.list(new QueryWrapper<>(param)); + List postUsers = sysPostUserService.list(); + + for (SysPost post : list) { + List puList = postUsers.stream().filter(a->a.getPostId().equals(post.getId())).collect(Collectors.toList()); + post.setPostUserList(puList); + } + List treeVoList = list.stream().map(source->{ SysPostTreeVo treeVo = new SysPostTreeVo(); treeVo.setId(source.getId()); @@ -53,6 +63,7 @@ public class SysPostController { treeVo.setRemark(source.getRemark()); treeVo.setId(source.getId()); treeVo.setParentId(source.getPid()); + treeVo.setPostUserList(source.getPostUserList()); treeVo.setSort(0); return treeVo; }).collect(Collectors.toList()); diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysPost.java b/src/main/java/com/qs/serve/modules/sys/entity/SysPost.java index 0c98a5f0..350ebe7f 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysPost.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/SysPost.java @@ -4,6 +4,7 @@ import java.time.LocalDate; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; @@ -90,5 +91,8 @@ public class SysPost implements Serializable { @TableField(exist = false) private Object parentInfo; + @TableField(exist = false) + private List postUserList; + } diff --git a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java index fdcbb28c..c6b1e725 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java @@ -46,4 +46,8 @@ public class SysUserVo { private Object postInfo; private String hrSystemInfo; + + /** 客户主要负责人标识 */ + private Integer supplierMainFlag; + } diff --git a/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java b/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java index 4aa1764f..9712ff90 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java @@ -8,6 +8,8 @@ import com.qs.serve.common.model.dto.TreeNode; import lombok.Data; import org.hibernate.validator.constraints.Length; +import java.util.List; + /** * @author YenHex * @since 2023/4/27 @@ -44,4 +46,6 @@ public class SysPostTreeVo extends TreeNode { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + + private List postUserList; } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index a6703c2e..934adfef 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -86,6 +86,25 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi } + @Override + public Object compensateNext(String targetId) { + VtbVerification verification = vtbVerificationMapper.selectById(targetId); + if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ + VtbVerification vtbVer = new VtbVerification(); + vtbVer.setId(verification.getId()); + vtbVer.setVerificationState(VtbVerificationState.Commiting.getCode()); + vtbVerificationMapper.updateById(vtbVer); + + TbsActivity tbsActivity = tbsActivityService.getById(verification.getActivityId()); + if(tbsActivity.getActivityState().equals(TbsActivityState.STATE_4_Release)){ + VtbVerificationService service = SpringUtils.getBean(VtbVerificationService.class); + service.cancelRelease(tbsActivity.getId()); + } + } + return null; + } + + @Override public Object compensateBacked(String targetId) { VtbVerification verification = vtbVerificationMapper.selectById(targetId); @@ -110,8 +129,8 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi tbsActivityService.updateById(activity); } TbsActivity tbsActivity = tbsActivityService.getById(verification.getActivityId()); - //if(tbsActivity.getCurrVerificationId()!=null && tbsActivity.getCurrVerificationId().equals(verification.getId().toString())&& - if( + if(tbsActivity.getCurrVerificationId()!=null && tbsActivity.getCurrVerificationId().equals(verification.getId().toString())&& + //if( tbsActivity.getActivityState().equals(TbsActivityState.STATE_1_Checking)){ //还原活动为待核销状态 TbsActivity activity = new TbsActivity(); diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml index e5af0da9..01bf60c3 100644 --- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml @@ -71,6 +71,10 @@ bms_supplier.`tenant_id`, bms_supplier.`cost_flag`, bms_supplier.`supplier_flag`, + bms_supplier.`supplier_info_flag`, + bms_supplier.`supplier_tax_number`, + bms_supplier.`supplier_license_img`, + bms_supplier.`supplier_user`, bms_supplier.`com_region`, bms_supplier.`com_region_code`, bms_supplier.`stop_flag`,