优化

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 Double cdefine26;//预算单价
+
+
     private String cdefine30;//设备位号
 
     private String cdefine22;//需求人

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

@@ -22,6 +22,8 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_detail")
 public class LongYanPurchaseDetail implements Serializable{
+    private Double cdefine26;//预算单价
+
     private String cdefine30;//设备位号
 
     private String cdefine22;//需求人

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

@@ -23,6 +23,8 @@ import java.util.function.DoubleToLongFunction;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailVO extends BaseVO implements Serializable{
+    private Double cdefine26;//预算单价
+
     private String cdefine30;//设备位号
 
     private String cdefine22;//需求人

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

@@ -33,6 +33,7 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -225,6 +226,11 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         }
     }
 
+    public static void main(String[] args) {
+        Double num = 1.2222222;
+        DecimalFormat df = new DecimalFormat("#.0000");
+        System.out.println(df.format(num));
+    }
     @Override
     public LongYanPurchaseOrder saveModelByDTO(LongYanPurchaseOrderDTO model) {
         UserInfo userInfo = SecurityUtils.getUserInfo();
@@ -257,6 +263,8 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         if(project != null){
             for (LongYanPurchaseDetailDTO detailDTO : detailDTOS) {
                 detailDTO.setId(IdGeneratorUtils.getObjectId());
+                DecimalFormat df = new DecimalFormat("#.0000");
+                detailDTO.setCdefine26(Double.parseDouble(df.format(detailDTO.getFunitprice()*1.13)));
                 detailDTO.setCreatedTime(LocalDateTime.now());
                 detailDTO.setCreatedUserId(userInfo.getUserId());
                 detailDTO.setCreatedUserName(userInfo.getUsername());
@@ -275,6 +283,7 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
         }else{
             for (LongYanPurchaseDetailDTO detailDTO : detailDTOS) {
                 detailDTO.setId(IdGeneratorUtils.getObjectId());
+                detailDTO.setCdefine26(detailDTO.getFunitprice()*1.13);
                 detailDTO.setCreatedTime(LocalDateTime.now());
                 detailDTO.setCreatedUserId(userInfo.getUserId());
                 detailDTO.setCreatedUserName(userInfo.getUsername());

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -1197,7 +1197,7 @@ public class YongyouServiceImpl implements YongyouService {
                 } else {
                     detail.setCdefine30(vo.getPositionNo());
                 }
-
+                detail.setCdefine26(orderVO.getCdefine26().toString());
                 detail.setCdefine22(orderVO.getCdefine22());
                 detail.setCdefine28(orderVO.getCdefine28());
                 detail.setCdefine29(dept);
@@ -1224,6 +1224,7 @@ public class YongyouServiceImpl implements YongyouService {
 
                 Double imoney = ftaxprice * orderVO.getNum().doubleValue() - itaxprice;///本币不含税金额 = 本币含税单价 * 数量 - 本币税额
 
+
                 detail.setIorisum(MathUtils.formatDouble1(iorisum, 2));
                 detail.setIoritaxprice(MathUtils.formatDouble1(ioritaxprice, 2));
 

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

@@ -8,6 +8,8 @@ import lombok.Data;
  */
 @Data
 public class PuAppDetail {
+    private String cdefine26;//预算单价
+
     private String cdefine30;//设备位号
 
     private String cdefine22;//需求人