订单采购3

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -166,12 +166,14 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             Map<String, Object> formData = BeanUtil.beanToMap(sapPurchaseOrder);
             String bizId = sapPurchaseApprovalApplication.startProcessInstance(SapPurchaseOrderApplication.PROCESS_DEFINITION_KEY, formData);
             sapPurchaseOrder.setId(bizId);
+            //映射双方字段
+            sapPurchaseOrder.setFillinDate(sapPurchaseOrderVo.getAedat());
+
             sapPurchaseOrder = this.sapPurchaseOrderRepository.save(sapPurchaseOrder);
             purchaseOrderId=sapPurchaseOrder.getId();
         }else {
             //数据第n次接收覆盖上一次数据
-            purchaseOrder.setBatxt(sapPurchaseOrderVo.getBatxt());
-            purchaseOrder.setBsart(sapPurchaseOrderVo.getBsart());
+            BeanUtil.copyProperties(sapPurchaseOrderVo, purchaseOrder);
             this.sapPurchaseOrderRepository.save(purchaseOrder);
 
             List<SapPurchaseOrderItem> purchaseOrderItems = sapPurchaseOrderItemApplication.getPurchaseOrderItems(purchaseOrder.getId());

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java

@@ -56,7 +56,7 @@ public class SapPurchaseOrderController extends CommonController {
     }
 
     @SkipAuth
-    @RequestMapping( value = "/getSapPurchaseOrder",consumes = "application/json; charset=UTF-8")
+    @RequestMapping( value = "/getSapPurchaseOrder",consumes = "application/json; charset=UTF-8", produces = "application/json; charset=UTF-8")
     @ResponseBody
     public HashMap<String, Object> getSapPurchaseOrder(@RequestBody SapPurchaseOrderDto sapPurchaseOrderDto){
         this.sapPurchaseOrderApplication.saveSapPurchaseOrderDto(sapPurchaseOrderDto);

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrderItem.java

 package com.huigou.topsun.sap.purchaseOrder.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
 import com.huigou.data.domain.model.AbstractEntity;
 import lombok.Data;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -23,7 +20,6 @@ import java.util.Date;
 @JsonIgnoreType
 public class SapPurchaseOrderItem extends AbstractEntity {
 
-
     /**
      * 
      */
@@ -133,9 +129,6 @@ public class SapPurchaseOrderItem extends AbstractEntity {
     private String lgobe;
 
 
-
-
-
     /**
      * 价格
      */

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderItemVo.java

@@ -63,16 +63,16 @@ public class SapPurchaseOrderItemVo {
     private String lgobe;
 
     @JsonProperty("NETPR")
-    private double netpr;
+    private Double netpr;
 
     @JsonProperty("PEINH")
-    private int peinh;
+    private Integer peinh;
 
     @JsonProperty("MWSKZ")
     private String mwskz;
 
     @JsonProperty("NETWR")
-    private double netwr;
+    private Double netwr;
 
     @JsonProperty("RETPO")
     private String retpo;

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderVo.java

@@ -6,6 +6,8 @@ import lombok.Data;
 
 import javax.persistence.Column;
 import java.io.Serializable;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -17,7 +19,21 @@ import java.util.List;
 @Data
 public class SapPurchaseOrderVo implements Serializable {
     @JsonProperty("AEDAT")
-    private String aedat;
+    private String aedatDate;
+
+    private Date aedat;
+
+    public Date getAedat() {
+        return aedat;
+    }
+
+
+    public void setAedatDate(String aedatDate) throws ParseException {
+        this.aedatDate = aedatDate;
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+        this.aedat = dateFormat.parse(aedatDate);
+    }
 
     @JsonProperty("ERNAM")
     private String ernam;

topsun/src/main/resources/config/topsun/sap/sapPurchaseOrder/sapPurchaseOrderItem.xml

@@ -4,7 +4,7 @@
         <sql-query>
             select t.* from sap_purchase_order_item t
         </sql-query>
-        <condition column="purchase_order_Id" name="purchaseOrderId" type="java.lang.String" symbol="=" alias="t"/>
+        <condition column="purchase_order_Id" name="sapPurchaseOrderId" type="java.lang.String" symbol="=" alias="t"/>
     </query>
 
 </query-mappings>
\ No newline at end of file