Sfoglia il codice sorgente

sale entity,实体类及定时任务频率修改,代码优化

luhg 8 anni fa
parent
commit
8353e656b7

+ 70 - 4
src/main/java/com/uas/eis/entity/Sale.java

@@ -2,13 +2,15 @@ package com.uas.eis.entity;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * Created by luhg on 2018/4/25.
  * Created by luhg on 2018/4/25.
  * 云顶销售订单
  * 云顶销售订单
  */
  */
-/*@Entity
-@Table(name = "edi_sale")*/
+@Entity
+@Table(name = "edi_sale")
 public class Sale  implements Serializable {
 public class Sale  implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -21,6 +23,70 @@ public class Sale  implements Serializable {
     @Column(name = "order_no")
     @Column(name = "order_no")
     private String orderNo;
     private String orderNo;
 
 
-    @Column(name = "order_no")
-    private String conSignTime;
+    @Column(name = "consign_time")
+    private Date signTime;
+
+    @Column(name = "customer_no")
+    private String customerCode;
+
+    @Column(name = "customer_name")
+    private String customerName;
+
+    /**
+     * 发票明细.
+     */
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "mainid_")
+    private List<SaleDetail> details;
+
+    public Sale(){
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Date getSignTime() {
+        return signTime;
+    }
+
+    public void setSignTime(Date signTime) {
+        this.signTime = signTime;
+    }
+
+    public String getCustomerCode() {
+        return customerCode;
+    }
+
+    public void setCustomerCode(String customerCode) {
+        this.customerCode = customerCode;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public List<SaleDetail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<SaleDetail> details) {
+        this.details = details;
+    }
 }
 }

+ 63 - 0
src/main/java/com/uas/eis/entity/SaleDetail.java

@@ -0,0 +1,63 @@
+package com.uas.eis.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * Created by luhg on 2018/4/25.
+ * 销售订单明细
+ */
+@Entity
+@Table(name = "edi_sale_detail")
+public class SaleDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue
+    @Column(name = "id_")
+    private Long id;
+
+    @Column(name = "spec_no")
+    private String specNo;
+
+    @Column(name = "goods_count")
+    private Long goodsCount;
+
+    @Column(name = "sell_price")
+    private Double sellPrice;
+
+    public SaleDetail(){
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSpecNo() {
+        return specNo;
+    }
+
+    public void setSpecNo(String specNo) {
+        this.specNo = specNo;
+    }
+
+    public Long getGoodsCount() {
+        return goodsCount;
+    }
+
+    public void setGoodsCount(Long goodsCount) {
+        this.goodsCount = goodsCount;
+    }
+
+    public Double getSellPrice() {
+        return sellPrice;
+    }
+
+    public void setSellPrice(Double sellPrice) {
+        this.sellPrice = sellPrice;
+    }
+}

+ 6 - 0
src/main/java/com/uas/eis/serviceImpl/StockServiceImpl.java

@@ -141,6 +141,8 @@ public class StockServiceImpl implements StockService{
     }
     }
 
 
     public void execPostProcedure(List<Map<String,Object>> datas,String responseText){
     public void execPostProcedure(List<Map<String,Object>> datas,String responseText){
+        System.out.println("datas:" + datas);
+        System.out.println("datas size:" + datas.size());
         for(Map<String,Object> data:datas){
         for(Map<String,Object> data:datas){
             String code = String.valueOf(data.get("outer_no"));
             String code = String.valueOf(data.get("outer_no"));
             String piClass = String.valueOf(data.get("src_order_type"));
             String piClass = String.valueOf(data.get("src_order_type"));
@@ -148,8 +150,11 @@ public class StockServiceImpl implements StockService{
             try {
             try {
                 postHist = ediPostLogDao.findByCodeAndPiClass(code,piClass);
                 postHist = ediPostLogDao.findByCodeAndPiClass(code,piClass);
                 if(postHist!=null){ //说明之前已经过账成功
                 if(postHist!=null){ //说明之前已经过账成功
+                    System.out.println("post confirm");
                     postConfirmToYunding(code,1);
                     postConfirmToYunding(code,1);
                 }else{ //没有记录,说明没有过账成功
                 }else{ //没有记录,说明没有过账成功
+                    System.out.println("code:" + code);
+                    System.out.println("piClass:" + piClass);
                     String out = baseDao.callProcedure("SP_YUNDING_STOCKPOST",new Object[]{code,piClass});
                     String out = baseDao.callProcedure("SP_YUNDING_STOCKPOST",new Object[]{code,piClass});
                     if (out!=null){
                     if (out!=null){
                         postFailLog(responseText,out);
                         postFailLog(responseText,out);
@@ -180,6 +185,7 @@ public class StockServiceImpl implements StockService{
         String jsonData = JacksonUtil.toSortJson(postMapData);
         String jsonData = JacksonUtil.toSortJson(postMapData);
         try{
         try{
             HttpUtil.Response response = HttpUtil.doPostToYunding(sendStockPostConfirmToYundingUrl,jsonData,timestamp);
             HttpUtil.Response response = HttpUtil.doPostToYunding(sendStockPostConfirmToYundingUrl,jsonData,timestamp);
+            System.out.println("confirm response:" + response.getResponseText());
         }catch (Exception e){
         }catch (Exception e){
             e.printStackTrace();
             e.printStackTrace();
         }
         }

+ 1 - 1
src/main/java/com/uas/eis/task/StockTask.java

@@ -14,7 +14,7 @@ public class StockTask {
     @Autowired
     @Autowired
     StockService stockService;
     StockService stockService;
 
 
-    @Scheduled(cron = "* */5 * * * *")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void autoPost() {
     public void autoPost() {
         stockService.autoPost(); //出入库定时过账
         stockService.autoPost(); //出入库定时过账
     }
     }