修改erp更新状态返回信息显示，增加拉取订单返回类型文件

src/main/java/com/seeyon/apps/collaboration/vo/PrintDataVO.java

+package com.seeyon.apps.collaboration.vo;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+public class PrintDataVO {
+
+    //成品尺寸（开型），委印单位（来稿单位），来稿人（联系人）
+    //印品种类，
+
+    private String source;//sourceid z
+    private String company;//来稿单位
+    private String name;//印品名称
+    private String id;//文档链接（文档id）
+    private String pagenumber;//原稿页数
+    private Timestamp date;//预取日期 z
+    private String number;//文档编号 z
+    private String contacts;//联系人
+    private String phone;//联系电话
+    private String secret;//保密
+    private String printtype;//印品种类
+    private String pagesize;//开型
+    private String cover;//封面工艺
+    private String pagesided;//单双面
+    private String coversize;//封面纸张 z
+    private String neivinsize;//内页纸张 z
+    private String insertsize;//插页纸张 z
+    private String machinetype;//装订方式
+    private String distribution;//配送方式 z
+    private String urgent;//加急 z
+    private BigDecimal totalprice;//总价 x
+    private BigDecimal copiesnumber;//份数
+    private BigDecimal unitprice;//单价 x
+    private String remark;//备注 z
+
+    public PrintDataVO() {
+        super();
+    }
+
+    public String getPrinttype() {
+        return printtype;
+    }
+
+    public void setPrinttype(String printtype) {
+        this.printtype = printtype;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPagenumber() {
+        return pagenumber;
+    }
+
+    public void setPagenumber(String pagenumber) {
+        this.pagenumber = pagenumber;
+    }
+
+    public Timestamp getDate() {
+        return date;
+    }
+
+    public void setDate(Timestamp date) {
+        this.date = date;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public String getPagesize() {
+        return pagesize;
+    }
+
+    public void setPagesize(String pagesize) {
+        this.pagesize = pagesize;
+    }
+
+    public String getCover() {
+        return cover;
+    }
+
+    public void setCover(String cover) {
+        this.cover = cover;
+    }
+
+    public String getPagesided() {
+        return pagesided;
+    }
+
+    public void setPagesided(String pagesided) {
+        this.pagesided = pagesided;
+    }
+
+    public String getCoversize() {
+        return coversize;
+    }
+
+    public void setCoversize(String coversize) {
+        this.coversize = coversize;
+    }
+
+    public String getNeivinsize() {
+        return neivinsize;
+    }
+
+    public void setNeivinsize(String neivinsize) {
+        this.neivinsize = neivinsize;
+    }
+
+    public String getInsertsize() {
+        return insertsize;
+    }
+
+    public void setInsertsize(String insertsize) {
+        this.insertsize = insertsize;
+    }
+
+    public String getMachinetype() {
+        return machinetype;
+    }
+
+    public void setMachinetype(String machinetype) {
+        this.machinetype = machinetype;
+    }
+
+    public String getDistribution() {
+        return distribution;
+    }
+
+    public void setDistribution(String distribution) {
+        this.distribution = distribution;
+    }
+
+    public String getUrgent() {
+        return urgent;
+    }
+
+    public void setUrgent(String urgent) {
+        this.urgent = urgent;
+    }
+
+    public BigDecimal getTotalprice() {
+        return totalprice;
+    }
+
+    public void setTotalprice(BigDecimal totalprice) {
+        this.totalprice = totalprice;
+    }
+
+    public BigDecimal getCopiesnumber() {
+        return copiesnumber;
+    }
+
+    public void setCopiesnumber(BigDecimal copiesnumber) {
+        this.copiesnumber = copiesnumber;
+    }
+
+    public BigDecimal getUnitprice() {
+        return unitprice;
+    }
+
+    public void setUnitprice(BigDecimal unitprice) {
+        this.unitprice = unitprice;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public PrintDataVO(String source, String company, String name, String id, String pagenumber, Timestamp date, String number, String contacts, String phone, String secret,String printtype, String pagesize, String cover, String pagesided, String coversize, String neivinsize, String insertsize, String machinetype, String distribution, String urgent, BigDecimal totalprice, BigDecimal copiesnumber, BigDecimal unitprice, String remark) {
+        this.source = source;
+        this.company = company;
+        this.name = name;
+        this.id = id;
+        this.pagenumber = pagenumber;
+        this.date = date;
+        this.number = number;
+        this.contacts = contacts;
+        this.phone = phone;
+        this.secret = secret;
+        this.printtype = printtype;
+        this.pagesize = pagesize;
+        this.cover = cover;
+        this.pagesided = pagesided;
+        this.coversize = coversize;
+        this.neivinsize = neivinsize;
+        this.insertsize = insertsize;
+        this.machinetype = machinetype;
+        this.distribution = distribution;
+        this.urgent = urgent;
+        this.totalprice = totalprice;
+        this.copiesnumber = copiesnumber;
+        this.unitprice = unitprice;
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "PrintDataVO{" +
+                "source='" + source + '\'' +
+                ", company='" + company + '\'' +
+                ", name='" + name + '\'' +
+                ", id='" + id + '\'' +
+                ", pagenumber='" + pagenumber + '\'' +
+                ", date='" + date + '\'' +
+                ", number='" + number + '\'' +
+                ", contacts='" + contacts + '\'' +
+                ", phone='" + phone + '\'' +
+                ", secret='" + secret + '\'' +
+                ", printtype='" + printtype + '\'' +
+                ", pagesize='" + pagesize + '\'' +
+                ", cover='" + cover + '\'' +
+                ", pagesided='" + pagesided + '\'' +
+                ", coversize='" + coversize + '\'' +
+                ", neivinsize='" + neivinsize + '\'' +
+                ", insertsize='" + insertsize + '\'' +
+                ", machinetype='" + machinetype + '\'' +
+                ", distribution='" + distribution + '\'' +
+                ", urgent='" + urgent + '\'' +
+                ", totalprice=" + totalprice +
+                ", copiesnumber='" + copiesnumber + '\'' +
+                ", unitprice=" + unitprice +
+                ", remark='" + remark + '\'' +
+                '}';
+    }
+
+
+}

src/main/java/com/seeyon/ctp/rest/resources/CollaborationResource.java

@@ -8106,13 +8106,13 @@ public class CollaborationResource  extends BaseResource {
         if(isNull(sourceId)) {
             map.put("success", false);
             map.put("msg", "sourceId不能为空.");
-            map.put("date", "");
+            map.put("sourceId", "");
             return ok(map);
         }
         if(isNull(erpState)) {
             map.put("success", false);
             map.put("msg", "erpState不能为空.");
-            map.put("date", "");
+            map.put("sourceId", "");
             return ok(map);
         }
 //        ColSummary colSummary = colManager.getColSummaryById(summaryId);
@@ -8122,11 +8122,11 @@ public class CollaborationResource  extends BaseResource {
             colManager.updateColSummaryErpStateById(sourceId, erpState);
             map.put("success", true);
             map.put("msg", "更新状态成功.");
-            map.put("date", sourceId);
+            map.put("sourceId", sourceId);
         }else {
             map.put("success", false);
             map.put("msg", "查询不到此source.");
-            map.put("date", sourceId);
+            map.put("sourceId", sourceId);
         }        return ok(map);
     }