优化

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseDetailDTO.java

@@ -23,6 +23,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailDTO extends BaseDTO implements Serializable {
+    private String ftaxprice;//单价
+    private String cdefine12;//物料简述
+
     private String yongYouRemark;
     private String projectNo; // 项目大类编码citem_class
     private String projectName; // 项目大类名称citemcname

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseOrderDTO.java

@@ -23,6 +23,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
+    private String cbmemo;//物资描述
+
     private String errorMessage;//错误信息
 
     private String refuseRemark;//被拒备注

platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseDetail.java

@@ -22,6 +22,9 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_detail")
 public class LongYanPurchaseDetail implements Serializable{
+    private String ftaxprice;//单价
+    private String cdefine12;//物料简述
+
     private String yongYouRemark;
 
     private String projectNo; // 项目大类编码citem_class

platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseOrder.java

@@ -24,6 +24,8 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_order")
 public class LongYanPurchaseOrder implements Serializable{
+    private String cbmemo;//物资描述
+
     private String errorMessage;//错误信息
     private String refuseRemark;//被拒备注
     private LocalDate needDate;//需求日期

platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseDetailVO.java

@@ -22,6 +22,9 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailVO extends BaseVO implements Serializable{
+    private String ftaxprice;//单价
+    private String cdefine12;//物料简述
+
     private String yongYouId;
     private String yongYouRemark;
     private String projectNo; // 项目大类编码citem_class

platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseOrderVO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
+    private String cbmemo;//物资描述
 
     private String errorMessage;//错误信息
 

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -2,6 +2,9 @@ package com.platform.service.longyanpurchaseorder.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.bean.DictVO;
+import com.platform.common.cache.DictCache;
+import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
@@ -36,6 +39,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 龙岩采购单表 service 实现类
@@ -217,6 +221,22 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
 
     @Override
     public LongYanPurchaseOrder saveModelByDTO(LongYanPurchaseOrderDTO model) {
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+
+            List<DictVO> dictVOS = DictCache.getChildren("CANNOT_MOD_NAMES");
+            List<String> codes = dictVOS.stream().map(DictVO::getCode).collect(Collectors.toList());
+            Boolean flag = false;
+            for (String code : codes) {
+                if (code.equals(userInfo.getUsername())) {
+                    flag = true;
+                    break;
+                }
+            }
+            if (!flag){
+                throw new BusinessException("对不起，您没有请购权限！");
+            }
+
+
         List<LongYanPurchaseDetailDTO> detailDTOS = model.getDetailDTOS();
         model.setStatus(LongYanPurchaseOrderStatusEnum.caogao.getValue());
         BigDecimal countNum = mapper.getPurchaseOrderCount1(new LongYanPurchaseOrderDTO());
@@ -227,7 +247,6 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         }
 
         model.setPurchaseNo(IdGeneratorUtils.getPurchaseNo(count));
-        UserInfo userInfo = SecurityUtils.getUserInfo();
         BigDecimal totalNum = new BigDecimal(0);
         if(project != null){
             for (LongYanPurchaseDetailDTO detailDTO : detailDTOS) {

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.github.pagehelper.PageHelper;
+import com.platform.common.bean.DictVO;
 import com.platform.common.cache.DictCache;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.constant.SecurityConstants;
@@ -167,6 +168,17 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     @Master
     @Transactional(rollbackFor = Exception.class)
     public void modModelByDTO(SysUserDTO model) {
+        SysUser user= mapper.selectByPrimaryKey(model.getUserId());
+        if (!user.getUsername().equals(model.getUsername())){
+                List<DictVO> dictVOS = DictCache.getChildren("CANNOT_MOD_NAMES");
+                List<String> codes = dictVOS.stream().map(DictVO::getCode).collect(Collectors.toList());
+                for (String code : codes) {
+                    if (code.equals(user.getUsername())) {
+                        throw new BusinessException("采购功能限制该账号不可更改账号名称！");
+                    }
+                }
+
+        }
         setUpdateUserInfo(model);
         moneyType(model);
         SysUser entity = BeanConverterUtil.copyObjectProperties(model, SysUser.class);

platform-service/src/main/java/handler/yongyou/request/PuAppDetail.java

@@ -7,6 +7,9 @@ import lombok.Data;
  */
 @Data
 public class PuAppDetail {
+    private String ftaxprice;//单价
+    private String cdefine12;//物料简述
+
     private String cinvcode;//存货编码
 
     private String ipertaxrate;//税率