优化

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

@@ -25,7 +25,6 @@ import java.util.List;
 public class LongYanPurchaseDetailDTO extends BaseDTO implements Serializable {
     private String cpersoncode;//请购人编码
     private String ftaxprice;//单价
-    private String cdefine12;//物料简述
 
     private String yongYouRemark;
     private String projectNo; // 项目大类编码citem_class

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

@@ -23,9 +23,15 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
+    private String cdefine12;//物料简述
+
     private String cpersoncode;//请购人编码
 
-    private String cbmemo;//物资描述
+//    private String cbmemo;//物资描述
+
+    private String cdefine11;//物资描述
+
+    private LocalDate cdefine6;//到货时间
 
     private String errorMessage;//错误信息
 

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

@@ -24,7 +24,6 @@ import java.math.BigDecimal;
 public class LongYanPurchaseDetail implements Serializable{
 
     private String ftaxprice;//单价
-    private String cdefine12;//物料简述
 
     private String yongYouRemark;
 

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

@@ -24,10 +24,16 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_long_yan_purchase_order")
 public class LongYanPurchaseOrder implements Serializable{
+    private String cdefine12;//物料简述
+
     private String cpersoncode;//请购人编码
 
+    private String cdefine11;//物资描述
+
+    private LocalDate cdefine6;//到货时间
+
 
-    private String cbmemo;//物资描述
+//    private String cbmemo;//物资描述
 
     private String errorMessage;//错误信息
     private String refuseRemark;//被拒备注

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

@@ -24,7 +24,6 @@ import java.math.BigDecimal;
 public class LongYanPurchaseDetailVO extends BaseVO implements Serializable{
 
     private String ftaxprice;//单价
-    private String cdefine12;//物料简述
 
     private String yongYouId;
     private String yongYouRemark;

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

@@ -24,9 +24,15 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderVO extends BaseVO implements Serializable{
+    private String cdefine12;//物料简述
+
     private String cpersoncode;//请购人编码
 
-    private String cbmemo;//物资描述
+//    private String cbmemo;//物资描述
+
+    private String cdefine11;//物资描述
+
+    private LocalDate cdefine6;//到货时间
 
     private String errorMessage;//错误信息
 

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

@@ -687,7 +687,7 @@ public class YongyouServiceImpl implements YongyouService {
             addBom(vo,detailVOS);
         }
         PuAppMain puAppMain = new PuAppMain();
-        puAppMain.setCpersoncode(vo.getCreatedUserName());
+//        puAppMain.setCpersoncode(vo.getCreatedUserName());
         puAppMain.setCbustype(vo.getCbustype());
         puAppMain.setCdepcode(vo.getCdepcode());
         puAppMain.setCcode(vo.getPurchaseNo());
@@ -708,7 +708,9 @@ public class YongyouServiceImpl implements YongyouService {
         puAppMain.setCmaker(vo.getCreatedUserName());
         puAppMain.setDdate(DateUtils.dateToString(vo.getCreatedTime()));
         puAppMain.setCptcode(vo.getCptcode());
-        puAppMain.setCbmemo(vo.getCbmemo());
+        puAppMain.setCdefine12(vo.getCdefine12());
+//        puAppMain.setCbmemo(vo.getCbmemo());
+        puAppMain.setCdefine6(vo.getPlanGetDate().toString());
         List<PuAppDetail> puAppDetails = new ArrayList<>();
         for (LongYanPurchaseDetailVO orderVO:detailVOS){
             PuAppDetail detail = new PuAppDetail();
@@ -722,7 +724,7 @@ public class YongyouServiceImpl implements YongyouService {
             detail.setCitemcode(orderVO.getProjectSecondNo());
 
             detail.setFtaxprice(orderVO.getFtaxprice());
-            detail.setCdefine12(orderVO.getCdefine12());
+//            detail.setCdefine12(orderVO.getCdefine12());
             puAppDetails.add(detail);
         }
         PuAppVouch puAppVouch = new PuAppVouch();

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

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

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

@@ -7,6 +7,9 @@ import lombok.Data;
  */
 @Data
 public class PuAppMain{
+
+    private String cdefine12;//物料简述
+
     private String cbmemo;//物资描述
 
     private String cdepcode;//部门编码
@@ -25,11 +28,19 @@ public class PuAppMain{
 
     private String cdefine2;//设备
 
-    private String cdefine11;//计划备注
+//    private String cdefine11;//计划备注
 
     private String cdefine3; // 项目负责人
 
     private String cpersoncode;//请购人
 
 
+    private String  cmemo;//请购原因
+
+    private String cdefine11;//物资描述
+
+    private String cdefine6;//到货时间
+
+
+
 }