merge

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/PurchaseDTO.java

@@ -13,49 +13,43 @@ import java.util.Date;
  */
 @ApiModel(value = "Purchase", description = "采购订单")
 public class PurchaseDTO implements Serializable{
-    @ApiModelProperty(value = "ID")
-    private Long id;
+    protected Long id;
     /**
-     * 编号
+     * company id
      */
-    @ApiModelProperty(value = "编号")
+    protected long companyId;
+    protected Date createTime;
+    protected long creatorId;
+    protected Date updateTime;
+    protected long updaterId;
+
     private String puCode;
-    /**
-     * 状态
-     */
-    private String puStatus;
-    /**
-     * 供应商
-     */
-    private DocBaseDTO contact;
-    /**
-     * 交货日期
-     */
-    private Date puDelivery;
-    /**
-     * 单据日期
-     */
+
     private Date puDate;
-    /**
-     * 自定义字段1
-     */
-    private String puText1;
-    /**
-     * 自定义字段2
-     */
-    private String puText2;
-    /**
-     * 自定义字段3
-     */
-    private String puText3;
-    /**
-     * 自定义字段4
-     */
-    private String puText4;
-    /**
-     * 自定义字段5
-     */
-    private String puText5;
+
+    private Integer puVendid;
+
+    private String puVendcode;
+
+    private String puVendname;
+
+    private Integer puBuyerid;
+
+    private String puBuyercode;
+
+    private String puBuyername;
+
+    private Date puDelivery;
+
+    private Double puTaxtotal;
+
+    private Double puTotal;
+
+    private String puRemark;
+
+    private String puTotalupper;
+
+    private String puPrintstatus;
 
     public Long getId() {
         return id;
@@ -65,6 +59,46 @@ public class PurchaseDTO implements Serializable{
         this.id = id;
     }
 
+    public long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public long getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public long getUpdaterId() {
+        return updaterId;
+    }
+
+    public void setUpdaterId(long updaterId) {
+        this.updaterId = updaterId;
+    }
+
     public String getPuCode() {
         return puCode;
     }
@@ -73,20 +107,60 @@ public class PurchaseDTO implements Serializable{
         this.puCode = puCode;
     }
 
-    public String getPuStatus() {
-        return puStatus;
+    public Date getPuDate() {
+        return puDate;
     }
 
-    public void setPuStatus(String puStatus) {
-        this.puStatus = puStatus;
+    public void setPuDate(Date puDate) {
+        this.puDate = puDate;
     }
 
-    public DocBaseDTO getContact() {
-        return contact;
+    public Integer getPuVendid() {
+        return puVendid;
     }
 
-    public void setContact(DocBaseDTO contact) {
-        this.contact = contact;
+    public void setPuVendid(Integer puVendid) {
+        this.puVendid = puVendid;
+    }
+
+    public String getPuVendcode() {
+        return puVendcode;
+    }
+
+    public void setPuVendcode(String puVendcode) {
+        this.puVendcode = puVendcode;
+    }
+
+    public String getPuVendname() {
+        return puVendname;
+    }
+
+    public void setPuVendname(String puVendname) {
+        this.puVendname = puVendname;
+    }
+
+    public Integer getPuBuyerid() {
+        return puBuyerid;
+    }
+
+    public void setPuBuyerid(Integer puBuyerid) {
+        this.puBuyerid = puBuyerid;
+    }
+
+    public String getPuBuyercode() {
+        return puBuyercode;
+    }
+
+    public void setPuBuyercode(String puBuyercode) {
+        this.puBuyercode = puBuyercode;
+    }
+
+    public String getPuBuyername() {
+        return puBuyername;
+    }
+
+    public void setPuBuyername(String puBuyername) {
+        this.puBuyername = puBuyername;
     }
 
     public Date getPuDelivery() {
@@ -97,12 +171,84 @@ public class PurchaseDTO implements Serializable{
         this.puDelivery = puDelivery;
     }
 
-    public Date getPuDate() {
-        return puDate;
+    public Double getPuTaxtotal() {
+        return puTaxtotal;
     }
 
-    public void setPuDate(Date puDate) {
-        this.puDate = puDate;
+    public void setPuTaxtotal(Double puTaxtotal) {
+        this.puTaxtotal = puTaxtotal;
+    }
+
+    public Double getPuTotal() {
+        return puTotal;
+    }
+
+    public void setPuTotal(Double puTotal) {
+        this.puTotal = puTotal;
+    }
+
+    public String getPuRemark() {
+        return puRemark;
+    }
+
+    public void setPuRemark(String puRemark) {
+        this.puRemark = puRemark;
+    }
+
+    public String getPuTotalupper() {
+        return puTotalupper;
+    }
+
+    public void setPuTotalupper(String puTotalupper) {
+        this.puTotalupper = puTotalupper;
+    }
+
+    public String getPuPrintstatus() {
+        return puPrintstatus;
+    }
+
+    public void setPuPrintstatus(String puPrintstatus) {
+        this.puPrintstatus = puPrintstatus;
+    }
+
+    public String getPuPrintstatuscode() {
+        return puPrintstatuscode;
+    }
+
+    public void setPuPrintstatuscode(String puPrintstatuscode) {
+        this.puPrintstatuscode = puPrintstatuscode;
+    }
+
+    public String getPuAcceptstatuscode() {
+        return puAcceptstatuscode;
+    }
+
+    public void setPuAcceptstatuscode(String puAcceptstatuscode) {
+        this.puAcceptstatuscode = puAcceptstatuscode;
+    }
+
+    public String getPuAcceptstatus() {
+        return puAcceptstatus;
+    }
+
+    public void setPuAcceptstatus(String puAcceptstatus) {
+        this.puAcceptstatus = puAcceptstatus;
+    }
+
+    public String getPuStatuscode() {
+        return puStatuscode;
+    }
+
+    public void setPuStatuscode(String puStatuscode) {
+        this.puStatuscode = puStatuscode;
+    }
+
+    public String getPuStatus() {
+        return puStatus;
+    }
+
+    public void setPuStatus(String puStatus) {
+        this.puStatus = puStatus;
     }
 
     public String getPuText1() {
@@ -144,4 +290,34 @@ public class PurchaseDTO implements Serializable{
     public void setPuText5(String puText5) {
         this.puText5 = puText5;
     }
+
+    public String getPuShipaddresscode() {
+        return puShipaddresscode;
+    }
+
+    public void setPuShipaddresscode(String puShipaddresscode) {
+        this.puShipaddresscode = puShipaddresscode;
+    }
+
+    private String puPrintstatuscode;
+
+    private String puAcceptstatuscode;
+
+    private String puAcceptstatus;
+
+    private String puStatuscode;
+
+    private String puStatus;
+
+    private String puText1;
+
+    private String puText2;
+
+    private String puText3;
+
+    private String puText4;
+
+    private String puText5;
+
+    private String puShipaddresscode;
 }

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/PurchaseItemDTO.java

@@ -4,70 +4,14 @@ import com.usoftchina.saas.common.dto.DocBaseDTO;
 import com.usoftchina.saas.common.dto.ProductBaseDTO;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author yingp
  * @date 2018/10/9
  */
 public class PurchaseItemDTO implements Serializable{
-    private Long id;
-    private Long pdPuid;
-
-    private String pdCode;
-
-    private Integer pdDetno;
-    /**
-     * 商品
-     */
-    private ProductBaseDTO product;
-    /**
-     * 仓库
-     */
-    private DocBaseDTO warehouse;
-    /**
-     * 数量
-     */
-    private Double pdQty;
-    /**
-     * 单价
-     */
-    private Double pdPrice;
-    /**
-     * 含税单价
-     */
-    private Double pdTotal;
-    /**
-     * 税率
-     */
-    private Float taxRate;
-    /**
-     * 税额
-     */
-    private Double pdTaxtotal;
-    /**
-     * 折扣率
-     */
-    private Float disRate;
-    /**
-     * 折扣额
-     */
-    private Double disAmount;
-    /**
-     * 金额
-     */
-    private Double amount;
-    /**
-     * 价税合计
-     */
-    private Double totalTaxAmount;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 关联订单
-     */
-    private DocBaseDTO srcOrder;
+    protected Long id;
 
     public Long getId() {
         return id;
@@ -77,11 +21,57 @@ public class PurchaseItemDTO implements Serializable{
         this.id = id;
     }
 
-    public Long getPdPuid() {
+    public long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(long companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * company id
+
+     */
+    protected long companyId;
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public long getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public long getUpdaterId() {
+        return updaterId;
+    }
+
+    public void setUpdaterId(long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    public Integer getPdPuid() {
         return pdPuid;
     }
 
-    public void setPdPuid(Long pdPuid) {
+    public void setPdPuid(Integer pdPuid) {
         this.pdPuid = pdPuid;
     }
 
@@ -101,20 +91,28 @@ public class PurchaseItemDTO implements Serializable{
         this.pdDetno = pdDetno;
     }
 
-    public ProductBaseDTO getProduct() {
-        return product;
+    public Integer getPdProdid() {
+        return pdProdid;
+    }
+
+    public void setPdProdid(Integer pdProdid) {
+        this.pdProdid = pdProdid;
+    }
+
+    public String getPdProdcode() {
+        return pdProdcode;
     }
 
-    public void setProduct(ProductBaseDTO product) {
-        this.product = product;
+    public void setPdProdcode(String pdProdcode) {
+        this.pdProdcode = pdProdcode;
     }
 
-    public DocBaseDTO getWarehouse() {
-        return warehouse;
+    public String getPdUnit() {
+        return pdUnit;
     }
 
-    public void setWarehouse(DocBaseDTO warehouse) {
-        this.warehouse = warehouse;
+    public void setPdUnit(String pdUnit) {
+        this.pdUnit = pdUnit;
     }
 
     public Double getPdQty() {
@@ -141,14 +139,6 @@ public class PurchaseItemDTO implements Serializable{
         this.pdTotal = pdTotal;
     }
 
-    public Float getTaxRate() {
-        return taxRate;
-    }
-
-    public void setTaxRate(Float taxRate) {
-        this.taxRate = taxRate;
-    }
-
     public Double getPdTaxtotal() {
         return pdTaxtotal;
     }
@@ -157,51 +147,138 @@ public class PurchaseItemDTO implements Serializable{
         this.pdTaxtotal = pdTaxtotal;
     }
 
-    public Float getDisRate() {
-        return disRate;
+    public Double getPdAcceptqty() {
+        return pdAcceptqty;
+    }
+
+    public void setPdAcceptqty(Double pdAcceptqty) {
+        this.pdAcceptqty = pdAcceptqty;
+    }
+
+    public Double getPdDelivery() {
+        return pdDelivery;
+    }
+
+    public void setPdDelivery(Double pdDelivery) {
+        this.pdDelivery = pdDelivery;
+    }
+
+    public String getPdSalecode() {
+        return pdSalecode;
+    }
+
+    public void setPdSalecode(String pdSalecode) {
+        this.pdSalecode = pdSalecode;
+    }
+
+    public Integer getPdSaledetno() {
+        return pdSaledetno;
+    }
+
+    public void setPdSaledetno(Integer pdSaledetno) {
+        this.pdSaledetno = pdSaledetno;
+    }
+
+    public Integer getPdSdid() {
+        return pdSdid;
+    }
+
+    public void setPdSdid(Integer pdSdid) {
+        this.pdSdid = pdSdid;
+    }
+
+    public String getPdText1() {
+        return pdText1;
     }
 
-    public void setDisRate(Float disRate) {
-        this.disRate = disRate;
+    public void setPdText1(String pdText1) {
+        this.pdText1 = pdText1;
     }
 
-    public Double getDisAmount() {
-        return disAmount;
+    public String getPdText2() {
+        return pdText2;
     }
 
-    public void setDisAmount(Double disAmount) {
-        this.disAmount = disAmount;
+    public void setPdText2(String pdText2) {
+        this.pdText2 = pdText2;
     }
 
-    public Double getAmount() {
-        return amount;
+    public String getPdText3() {
+        return pdText3;
     }
 
-    public void setAmount(Double amount) {
-        this.amount = amount;
+    public void setPdText3(String pdText3) {
+        this.pdText3 = pdText3;
     }
 
-    public Double getTotalTaxAmount() {
-        return totalTaxAmount;
+    public String getPdText4() {
+        return pdText4;
     }
 
-    public void setTotalTaxAmount(Double totalTaxAmount) {
-        this.totalTaxAmount = totalTaxAmount;
+    public void setPdText4(String pdText4) {
+        this.pdText4 = pdText4;
     }
 
-    public String getRemark() {
-        return remark;
+    public String getPdText5() {
+        return pdText5;
     }
 
-    public void setRemark(String remark) {
-        this.remark = remark;
+    public void setPdText5(String pdText5) {
+        this.pdText5 = pdText5;
     }
 
-    public DocBaseDTO getSrcOrder() {
-        return srcOrder;
+    public Double getPdYqty() {
+        return pdYqty;
     }
 
-    public void setSrcOrder(DocBaseDTO srcOrder) {
-        this.srcOrder = srcOrder;
+    public void setPdYqty(Double pdYqty) {
+        this.pdYqty = pdYqty;
     }
+
+    protected Date createTime;
+    protected long creatorId;
+    protected Date updateTime;
+    protected long updaterId;
+    private Integer pdPuid;
+
+    private String pdCode;
+
+    private Integer pdDetno;
+
+    private Integer pdProdid;
+
+    private String pdProdcode;
+
+    private String pdUnit;
+
+    private Double pdQty;
+
+    private Double pdPrice;
+
+    private Double pdTotal;
+
+    private Double pdTaxtotal;
+
+    private Double pdAcceptqty;
+
+    private Double pdDelivery;
+
+    private String pdSalecode;
+
+    private Integer pdSaledetno;
+
+    private Integer pdSdid;
+
+    private String pdText1;
+
+    private String pdText2;
+
+    private String pdText3;
+
+    private String pdText4;
+
+    private String pdText5;
+
+    private Double pdYqty;
+
 }

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/PurchaseListDTO.java

@@ -11,69 +11,279 @@ import java.util.Date;
  * @date 2018/10/9
  */
 public class PurchaseListDTO implements Serializable {
-    private Long id;
-    /**
-     * 编号
-     */
-    private String code;
-    /**
-     * 状态
-     */
-    private String status;
-    /**
-     * 供应商
-     */
-    private String contactName;
-    /**
-     * 交货日期
-     */
-    private Date deliveryDate;
-    /**
-     * 单据日期
-     */
-    private Date docDate;
-    /**
-     * 打印状态
-     */
-    private String printStatus;
-    /**
-     * 打印次数
-     */
-    private Integer printTimes;
-    /**
-     * 自定义字段1
-     */
-    private String userDefined1;
-    /**
-     * 自定义字段2
-     */
-    private String userDefined2;
-    /**
-     * 自定义字段3
-     */
-    private String userDefined3;
-    /**
-     * 自定义字段4
-     */
-    private String userDefined4;
-    /**
-     * 自定义字段5
-     */
-    private String userDefined5;
-
-    public BigDecimal getPdDetno() {
+    protected long companyId;
+
+    protected Date updateTime;
+
+    public long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public long getUpdaterId() {
+        return updaterId;
+    }
+
+    public void setUpdaterId(long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    public Integer getPuId() {
+        return puId;
+    }
+
+    public void setPuId(Integer puId) {
+        this.puId = puId;
+    }
+
+    public String getPuCode() {
+        return puCode;
+    }
+
+    public void setPuCode(String puCode) {
+        this.puCode = puCode;
+    }
+
+    public Date getPuDate() {
+        return puDate;
+    }
+
+    public void setPuDate(Date puDate) {
+        this.puDate = puDate;
+    }
+
+    public Integer getPuVendid() {
+        return puVendid;
+    }
+
+    public void setPuVendid(Integer puVendid) {
+        this.puVendid = puVendid;
+    }
+
+    public String getPuVendcode() {
+        return puVendcode;
+    }
+
+    public void setPuVendcode(String puVendcode) {
+        this.puVendcode = puVendcode;
+    }
+
+    public String getPuVendname() {
+        return puVendname;
+    }
+
+    public void setPuVendname(String puVendname) {
+        this.puVendname = puVendname;
+    }
+
+    public Integer getPuBuyerid() {
+        return puBuyerid;
+    }
+
+    public void setPuBuyerid(Integer puBuyerid) {
+        this.puBuyerid = puBuyerid;
+    }
+
+    public String getPuBuyercode() {
+        return puBuyercode;
+    }
+
+    public void setPuBuyercode(String puBuyercode) {
+        this.puBuyercode = puBuyercode;
+    }
+
+    public String getPuBuyername() {
+        return puBuyername;
+    }
+
+    public void setPuBuyername(String puBuyername) {
+        this.puBuyername = puBuyername;
+    }
+
+    public Date getPuDelivery() {
+        return puDelivery;
+    }
+
+    public void setPuDelivery(Date puDelivery) {
+        this.puDelivery = puDelivery;
+    }
+
+    public Double getPuTaxtotal() {
+        return puTaxtotal;
+    }
+
+    public void setPuTaxtotal(Double puTaxtotal) {
+        this.puTaxtotal = puTaxtotal;
+    }
+
+    public Double getPuTotal() {
+        return puTotal;
+    }
+
+    public void setPuTotal(Double puTotal) {
+        this.puTotal = puTotal;
+    }
+
+    public String getPuRemark() {
+        return puRemark;
+    }
+
+    public void setPuRemark(String puRemark) {
+        this.puRemark = puRemark;
+    }
+
+    public String getPuTotalupper() {
+        return puTotalupper;
+    }
+
+    public void setPuTotalupper(String puTotalupper) {
+        this.puTotalupper = puTotalupper;
+    }
+
+    public String getPuPrintstatus() {
+        return puPrintstatus;
+    }
+
+    public void setPuPrintstatus(String puPrintstatus) {
+        this.puPrintstatus = puPrintstatus;
+    }
+
+    public String getPuPrintstatuscode() {
+        return puPrintstatuscode;
+    }
+
+    public void setPuPrintstatuscode(String puPrintstatuscode) {
+        this.puPrintstatuscode = puPrintstatuscode;
+    }
+
+    public String getPuAcceptstatuscode() {
+        return puAcceptstatuscode;
+    }
+
+    public void setPuAcceptstatuscode(String puAcceptstatuscode) {
+        this.puAcceptstatuscode = puAcceptstatuscode;
+    }
+
+    public String getPuAcceptstatus() {
+        return puAcceptstatus;
+    }
+
+    public void setPuAcceptstatus(String puAcceptstatus) {
+        this.puAcceptstatus = puAcceptstatus;
+    }
+
+    public String getPuStatuscode() {
+        return puStatuscode;
+    }
+
+    public void setPuStatuscode(String puStatuscode) {
+        this.puStatuscode = puStatuscode;
+    }
+
+    public String getPuStatus() {
+        return puStatus;
+    }
+
+    public void setPuStatus(String puStatus) {
+        this.puStatus = puStatus;
+    }
+
+    public String getPuText1() {
+        return puText1;
+    }
+
+    public void setPuText1(String puText1) {
+        this.puText1 = puText1;
+    }
+
+    public String getPuText2() {
+        return puText2;
+    }
+
+    public void setPuText2(String puText2) {
+        this.puText2 = puText2;
+    }
+
+    public String getPuText3() {
+        return puText3;
+    }
+
+    public void setPuText3(String puText3) {
+        this.puText3 = puText3;
+    }
+
+    public String getPuText4() {
+        return puText4;
+    }
+
+    public void setPuText4(String puText4) {
+        this.puText4 = puText4;
+    }
+
+    public String getPuText5() {
+        return puText5;
+    }
+
+    public void setPuText5(String puText5) {
+        this.puText5 = puText5;
+    }
+
+    public String getPuShipaddresscode() {
+        return puShipaddresscode;
+    }
+
+    public void setPuShipaddresscode(String puShipaddresscode) {
+        this.puShipaddresscode = puShipaddresscode;
+    }
+
+    public Integer getPdId() {
+        return pdId;
+    }
+
+    public void setPdId(Integer pdId) {
+        this.pdId = pdId;
+    }
+
+    public Integer getPdPuid() {
+        return pdPuid;
+    }
+
+    public void setPdPuid(Integer pdPuid) {
+        this.pdPuid = pdPuid;
+    }
+
+    public String getPdCode() {
+        return pdCode;
+    }
+
+    public void setPdCode(String pdCode) {
+        this.pdCode = pdCode;
+    }
+
+    public Integer getPdDetno() {
         return pdDetno;
     }
 
-    public void setPdDetno(BigDecimal pdDetno) {
+    public void setPdDetno(Integer pdDetno) {
         this.pdDetno = pdDetno;
     }
 
-    public BigDecimal getPdProdid() {
+    public Integer getPdProdid() {
         return pdProdid;
     }
 
-    public void setPdProdid(BigDecimal pdProdid) {
+    public void setPdProdid(Integer pdProdid) {
         this.pdProdid = pdProdid;
     }
 
@@ -85,142 +295,230 @@ public class PurchaseListDTO implements Serializable {
         this.pdProdcode = pdProdcode;
     }
 
-    /**
+    public String getPdUnit() {
+        return pdUnit;
+    }
 
-     * 从表序号
-     */
-    private BigDecimal pdDetno;
+    public void setPdUnit(String pdUnit) {
+        this.pdUnit = pdUnit;
+    }
 
-    /**
-     * 物料id
-     */
-    private BigDecimal pdProdid;
+    public Double getPdQty() {
+        return pdQty;
+    }
 
-    /**
-     * 物料编号
-     */
-    private String pdProdcode;
+    public void setPdQty(Double pdQty) {
+        this.pdQty = pdQty;
+    }
 
-    public Long getId() {
-        return id;
+    public Double getPdPrice() {
+        return pdPrice;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setPdPrice(Double pdPrice) {
+        this.pdPrice = pdPrice;
     }
 
-    public String getCode() {
-        return code;
+    public Double getPdTotal() {
+        return pdTotal;
     }
 
-    public void setCode(String code) {
-        this.code = code;
+    public void setPdTotal(Double pdTotal) {
+        this.pdTotal = pdTotal;
     }
 
-    public String getStatus() {
-        return status;
+    public Double getPdTaxtotal() {
+        return pdTaxtotal;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setPdTaxtotal(Double pdTaxtotal) {
+        this.pdTaxtotal = pdTaxtotal;
     }
 
-    public String getContactName() {
-        return contactName;
+    public Double getPdAcceptqty() {
+        return pdAcceptqty;
     }
 
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
+    public void setPdAcceptqty(Double pdAcceptqty) {
+        this.pdAcceptqty = pdAcceptqty;
     }
 
-    public Date getDeliveryDate() {
-        return deliveryDate;
+    public Double getPdDelivery() {
+        return pdDelivery;
     }
 
-    public void setDeliveryDate(Date deliveryDate) {
-        this.deliveryDate = deliveryDate;
+    public void setPdDelivery(Double pdDelivery) {
+        this.pdDelivery = pdDelivery;
     }
 
-    public Date getDocDate() {
-        return docDate;
+    public String getPdSalecode() {
+        return pdSalecode;
     }
 
-    public void setDocDate(Date docDate) {
-        this.docDate = docDate;
+    public void setPdSalecode(String pdSalecode) {
+        this.pdSalecode = pdSalecode;
     }
 
-    public String getPrintStatus() {
-        return printStatus;
+    public Integer getPdSaledetno() {
+        return pdSaledetno;
     }
 
-    public void setPrintStatus(String printStatus) {
-        this.printStatus = printStatus;
+    public void setPdSaledetno(Integer pdSaledetno) {
+        this.pdSaledetno = pdSaledetno;
     }
 
-    public Integer getPrintTimes() {
-        return printTimes;
+    public Integer getPdSdid() {
+        return pdSdid;
     }
 
-    public void setPrintTimes(Integer printTimes) {
-        this.printTimes = printTimes;
+    public void setPdSdid(Integer pdSdid) {
+        this.pdSdid = pdSdid;
     }
 
-    public String getUserDefined1() {
-        return userDefined1;
+    public String getPdText1() {
+        return pdText1;
     }
 
-    public void setUserDefined1(String userDefined1) {
-        this.userDefined1 = userDefined1;
+    public void setPdText1(String pdText1) {
+        this.pdText1 = pdText1;
     }
 
-    public String getUserDefined2() {
-        return userDefined2;
+    public String getPdText2() {
+        return pdText2;
     }
 
-    public void setUserDefined2(String userDefined2) {
-        this.userDefined2 = userDefined2;
+    public void setPdText2(String pdText2) {
+        this.pdText2 = pdText2;
     }
 
-    public String getUserDefined3() {
-        return userDefined3;
+    public String getPdText3() {
+        return pdText3;
     }
 
-    public void setUserDefined3(String userDefined3) {
-        this.userDefined3 = userDefined3;
+    public void setPdText3(String pdText3) {
+        this.pdText3 = pdText3;
     }
 
-    public String getUserDefined4() {
-        return userDefined4;
+    public String getPdText4() {
+        return pdText4;
     }
 
-    public void setUserDefined4(String userDefined4) {
-        this.userDefined4 = userDefined4;
+    public void setPdText4(String pdText4) {
+        this.pdText4 = pdText4;
     }
 
-    public String getUserDefined5() {
-        return userDefined5;
+    public String getPdText5() {
+        return pdText5;
     }
 
-    public void setUserDefined5(String userDefined5) {
-        this.userDefined5 = userDefined5;
+    public void setPdText5(String pdText5) {
+        this.pdText5 = pdText5;
     }
 
-    @Override
-    public String toString() {
-        return "PurchaseListDTO{" +
-                "id=" + id +
-                ", code='" + code + '\'' +
-                ", status='" + status + '\'' +
-                ", contactName='" + contactName + '\'' +
-                ", deliveryDate=" + deliveryDate +
-                ", docDate=" + docDate +
-                ", printStatus='" + printStatus + '\'' +
-                ", printTimes=" + printTimes +
-                ", userDefined1='" + userDefined1 + '\'' +
-                ", userDefined2='" + userDefined2 + '\'' +
-                ", userDefined3='" + userDefined3 + '\'' +
-                ", userDefined4='" + userDefined4 + '\'' +
-                ", userDefined5='" + userDefined5 + '\'' +
-                '}';
+    public Double getPdYqty() {
+        return pdYqty;
     }
+
+    public void setPdYqty(Double pdYqty) {
+        this.pdYqty = pdYqty;
+    }
+
+    protected long updaterId;
+
+    private  Integer puId;
+
+    private String puCode;
+
+    private Date puDate;
+
+    private Integer puVendid;
+
+    private String puVendcode;
+
+    private String puVendname;
+
+    private Integer puBuyerid;
+
+    private String puBuyercode;
+
+    private String puBuyername;
+
+    private Date puDelivery;
+
+    private Double puTaxtotal;
+
+    private Double puTotal;
+
+    private String puRemark;
+
+    private String puTotalupper;
+
+    private String puPrintstatus;
+
+    private String puPrintstatuscode;
+
+    private String puAcceptstatuscode;
+
+    private String puAcceptstatus;
+
+    private String puStatuscode;
+
+    private String puStatus;
+
+    private String puText1;
+
+    private String puText2;
+
+    private String puText3;
+
+    private String puText4;
+
+    private String puText5;
+
+    private String puShipaddresscode;
+
+    private Integer pdId;
+
+    private Integer pdPuid;
+
+    private String pdCode;
+
+    private Integer pdDetno;
+
+    private Integer pdProdid;
+
+    private String pdProdcode;
+
+    private String pdUnit;
+
+    private Double pdQty;
+
+    private Double pdPrice;
+
+    private Double pdTotal;
+
+    private Double pdTaxtotal;
+
+    private Double pdAcceptqty;
+
+    private Double pdDelivery;
+
+    private String pdSalecode;
+
+    private Integer pdSaledetno;
+
+    private Integer pdSdid;
+
+    private String pdText1;
+
+    private String pdText2;
+
+    private String pdText3;
+
+    private String pdText4;
+
+    private String pdText5;
+
+    private Double pdYqty;
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/9
  */
 @RestController
-@RequestMapping("/api/purchase/purchase")
+@RequestMapping("/purchase")
 public class PurchaseController {
 
     @Autowired
@@ -54,8 +54,8 @@ public class PurchaseController {
      */
     @PostMapping("/form")
     public Result<DocSavedDTO> saveFormData(@RequestBody PurchaseFormDTO formData) {
-        purchaseService.saveFormData(formData);
-        return Result.success();
+        Long pu_id = purchaseService.saveFormData(formData);
+        return Result.success(pu_id);
     }
 
     /**
@@ -64,7 +64,7 @@ public class PurchaseController {
      * @param id
      * @return
      */
-    @DeleteMapping
+    @DeleteMapping("/form")
     public Result delete(@RequestParam Integer id) {
         purchaseService.delete(id);
         return Result.success();
@@ -85,12 +85,13 @@ public class PurchaseController {
     /**
      * 采购订单审批
      *
-     * @param id
+     * @param formData
      * @return
      */
     @PostMapping("/audit")
-    public Result audit(@RequestParam Integer id) {
-        purchaseService.audit(id);
-        return Result.success();
+    public Result audit(@RequestBody PurchaseFormDTO formData) {
+        int affact = purchaseService.audit(formData);
+        return Result.success(affact);
     }
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/Purchase.java

@@ -33,8 +33,6 @@ public class Purchase extends CommonBaseEntity implements Serializable {
 
     private String puTotalupper;
 
-    private Date puIndate;
-
     private String puPrintstatus;
 
     private String puPrintstatuscode;
@@ -163,14 +161,6 @@ public class Purchase extends CommonBaseEntity implements Serializable {
         this.puTotalupper = puTotalupper == null ? null : puTotalupper.trim();
     }
 
-    public Date getPuIndate() {
-        return puIndate;
-    }
-
-    public void setPuIndate(Date puIndate) {
-        this.puIndate = puIndate;
-    }
-
     public String getPuPrintstatus() {
         return puPrintstatus;
     }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseList.java

@@ -1,94 +1,297 @@
 package com.usoftchina.saas.purchase.po;
 
-import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * @author: guq
  * @create: 2018-10-10 16:42
  **/
-public class PurchaseList extends CommonBaseEntity implements Serializable {
-
-    /**
-     * 编号
-     */
-    private String code;
-    /**
-     * 状态
-     */
-    private String status;
-    /**
-     * 供应商
-     */
-    private String contactName;
-    /**
-     * 交货日期
-     */
-    private Date deliveryDate;
-    /**
-     * 单据日期
-     */
-    private Date docDate;
-    /**
-     * 打印状态
-     */
-    private String printStatus;
-    /**
-     * 打印次数
-     */
-    private Integer printTimes;
-    /**
-     * 自定义字段1
-     */
-    private String userDefined1;
-    /**
-     * 自定义字段2
-     */
-    private String userDefined2;
-    /**
-     * 自定义字段3
-     */
-    private String userDefined3;
-    /**
-     * 自定义字段4
-     */
-    private String userDefined4;
-    /**
-     * 自定义字段5
-     */
-    private String userDefined5;
-
-    /**
-     * 从表序号
-     */
-    private BigDecimal pdDetno;
-
-    /**
-     * 物料id
-     */
-    private BigDecimal pdProdid;
-
-    /**
-     * 物料编号
-     */
-    private String pdProdcode;
+public class PurchaseList implements Serializable {
+
+    protected long companyId;
+    protected Date createTime;
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    protected Date updateTime;
+
+    public long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public long getUpdaterId() {
+        return updaterId;
+    }
+
+    public void setUpdaterId(long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    public Integer getPuId() {
+        return puId;
+    }
+
+    public void setPuId(Integer puId) {
+        this.puId = puId;
+    }
+
+    public String getPuCode() {
+        return puCode;
+    }
+
+    public void setPuCode(String puCode) {
+        this.puCode = puCode;
+    }
+
+    public Date getPuDate() {
+        return puDate;
+    }
+
+    public void setPuDate(Date puDate) {
+        this.puDate = puDate;
+    }
+
+    public Integer getPuVendid() {
+        return puVendid;
+    }
+
+    public void setPuVendid(Integer puVendid) {
+        this.puVendid = puVendid;
+    }
+
+    public String getPuVendcode() {
+        return puVendcode;
+    }
+
+    public void setPuVendcode(String puVendcode) {
+        this.puVendcode = puVendcode;
+    }
+
+    public String getPuVendname() {
+        return puVendname;
+    }
+
+    public void setPuVendname(String puVendname) {
+        this.puVendname = puVendname;
+    }
+
+    public Integer getPuBuyerid() {
+        return puBuyerid;
+    }
+
+    public void setPuBuyerid(Integer puBuyerid) {
+        this.puBuyerid = puBuyerid;
+    }
+
+    public String getPuBuyercode() {
+        return puBuyercode;
+    }
+
+    public void setPuBuyercode(String puBuyercode) {
+        this.puBuyercode = puBuyercode;
+    }
+
+    public String getPuBuyername() {
+        return puBuyername;
+    }
+
+    public void setPuBuyername(String puBuyername) {
+        this.puBuyername = puBuyername;
+    }
+
+    public Date getPuDelivery() {
+        return puDelivery;
+    }
+
+    public void setPuDelivery(Date puDelivery) {
+        this.puDelivery = puDelivery;
+    }
+
+    public Double getPuTaxtotal() {
+        return puTaxtotal;
+    }
+
+    public void setPuTaxtotal(Double puTaxtotal) {
+        this.puTaxtotal = puTaxtotal;
+    }
+
+    public Double getPuTotal() {
+        return puTotal;
+    }
+
+    public void setPuTotal(Double puTotal) {
+        this.puTotal = puTotal;
+    }
+
+    public String getPuRemark() {
+        return puRemark;
+    }
+
+    public void setPuRemark(String puRemark) {
+        this.puRemark = puRemark;
+    }
+
+    public String getPuTotalupper() {
+        return puTotalupper;
+    }
+
+    public void setPuTotalupper(String puTotalupper) {
+        this.puTotalupper = puTotalupper;
+    }
+
+    public String getPuPrintstatus() {
+        return puPrintstatus;
+    }
+
+    public void setPuPrintstatus(String puPrintstatus) {
+        this.puPrintstatus = puPrintstatus;
+    }
+
+    public String getPuPrintstatuscode() {
+        return puPrintstatuscode;
+    }
+
+    public void setPuPrintstatuscode(String puPrintstatuscode) {
+        this.puPrintstatuscode = puPrintstatuscode;
+    }
+
+    public String getPuAcceptstatuscode() {
+        return puAcceptstatuscode;
+    }
+
+    public void setPuAcceptstatuscode(String puAcceptstatuscode) {
+        this.puAcceptstatuscode = puAcceptstatuscode;
+    }
+
+    public String getPuAcceptstatus() {
+        return puAcceptstatus;
+    }
+
+    public void setPuAcceptstatus(String puAcceptstatus) {
+        this.puAcceptstatus = puAcceptstatus;
+    }
+
+    public String getPuStatuscode() {
+        return puStatuscode;
+    }
+
+    public void setPuStatuscode(String puStatuscode) {
+        this.puStatuscode = puStatuscode;
+    }
+
+    public String getPuStatus() {
+        return puStatus;
+    }
 
-    public BigDecimal getPdDetno() {
+    public void setPuStatus(String puStatus) {
+        this.puStatus = puStatus;
+    }
+
+    public String getPuText1() {
+        return puText1;
+    }
+
+    public void setPuText1(String puText1) {
+        this.puText1 = puText1;
+    }
+
+    public String getPuText2() {
+        return puText2;
+    }
+
+    public void setPuText2(String puText2) {
+        this.puText2 = puText2;
+    }
+
+    public String getPuText3() {
+        return puText3;
+    }
+
+    public void setPuText3(String puText3) {
+        this.puText3 = puText3;
+    }
+
+    public String getPuText4() {
+        return puText4;
+    }
+
+    public void setPuText4(String puText4) {
+        this.puText4 = puText4;
+    }
+
+    public String getPuText5() {
+        return puText5;
+    }
+
+    public void setPuText5(String puText5) {
+        this.puText5 = puText5;
+    }
+
+    public String getPuShipaddresscode() {
+        return puShipaddresscode;
+    }
+
+    public void setPuShipaddresscode(String puShipaddresscode) {
+        this.puShipaddresscode = puShipaddresscode;
+    }
+
+    public Integer getPdId() {
+        return pdId;
+    }
+
+    public void setPdId(Integer pdId) {
+        this.pdId = pdId;
+    }
+
+    public Integer getPdPuid() {
+        return pdPuid;
+    }
+
+    public void setPdPuid(Integer pdPuid) {
+        this.pdPuid = pdPuid;
+    }
+
+    public String getPdCode() {
+        return pdCode;
+    }
+
+    public void setPdCode(String pdCode) {
+        this.pdCode = pdCode;
+    }
+
+    public Integer getPdDetno() {
         return pdDetno;
     }
 
-    public void setPdDetno(BigDecimal pdDetno) {
+    public void setPdDetno(Integer pdDetno) {
         this.pdDetno = pdDetno;
     }
 
-    public BigDecimal getPdProdid() {
+    public Integer getPdProdid() {
         return pdProdid;
     }
 
-    public void setPdProdid(BigDecimal pdProdid) {
+    public void setPdProdid(Integer pdProdid) {
         this.pdProdid = pdProdid;
     }
 
@@ -100,128 +303,229 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
         this.pdProdcode = pdProdcode;
     }
 
+    public String getPdUnit() {
+        return pdUnit;
+    }
+
+    public void setPdUnit(String pdUnit) {
+        this.pdUnit = pdUnit;
+    }
+
+    public Double getPdQty() {
+        return pdQty;
+    }
+
+    public void setPdQty(Double pdQty) {
+        this.pdQty = pdQty;
+    }
 
+    public Double getPdPrice() {
+        return pdPrice;
+    }
 
-    public Long getId() {
-        return id;
+    public void setPdPrice(Double pdPrice) {
+        this.pdPrice = pdPrice;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public Double getPdTotal() {
+        return pdTotal;
     }
 
-    public String getCode() {
-        return code;
+    public void setPdTotal(Double pdTotal) {
+        this.pdTotal = pdTotal;
     }
 
-    public void setCode(String code) {
-        this.code = code;
+    public Double getPdTaxtotal() {
+        return pdTaxtotal;
     }
 
-    public String getStatus() {
-        return status;
+    public void setPdTaxtotal(Double pdTaxtotal) {
+        this.pdTaxtotal = pdTaxtotal;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public Double getPdAcceptqty() {
+        return pdAcceptqty;
     }
 
-    public String getContactName() {
-        return contactName;
+    public void setPdAcceptqty(Double pdAcceptqty) {
+        this.pdAcceptqty = pdAcceptqty;
     }
 
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
+    public Double getPdDelivery() {
+        return pdDelivery;
     }
 
-    public Date getDeliveryDate() {
-        return deliveryDate;
+    public void setPdDelivery(Double pdDelivery) {
+        this.pdDelivery = pdDelivery;
     }
 
-    public void setDeliveryDate(Date deliveryDate) {
-        this.deliveryDate = deliveryDate;
+    public String getPdSalecode() {
+        return pdSalecode;
     }
 
-    public Date getDocDate() {
-        return docDate;
+    public void setPdSalecode(String pdSalecode) {
+        this.pdSalecode = pdSalecode;
     }
 
-    public void setDocDate(Date docDate) {
-        this.docDate = docDate;
+    public Integer getPdSaledetno() {
+        return pdSaledetno;
     }
 
-    public String getPrintStatus() {
-        return printStatus;
+    public void setPdSaledetno(Integer pdSaledetno) {
+        this.pdSaledetno = pdSaledetno;
     }
 
-    public void setPrintStatus(String printStatus) {
-        this.printStatus = printStatus;
+    public Integer getPdSdid() {
+        return pdSdid;
     }
 
-    public Integer getPrintTimes() {
-        return printTimes;
+    public void setPdSdid(Integer pdSdid) {
+        this.pdSdid = pdSdid;
     }
 
-    public void setPrintTimes(Integer printTimes) {
-        this.printTimes = printTimes;
+    public String getPdText1() {
+        return pdText1;
     }
 
-    public String getUserDefined1() {
-        return userDefined1;
+    public void setPdText1(String pdText1) {
+        this.pdText1 = pdText1;
     }
 
-    public void setUserDefined1(String userDefined1) {
-        this.userDefined1 = userDefined1;
+    public String getPdText2() {
+        return pdText2;
     }
 
-    public String getUserDefined2() {
-        return userDefined2;
+    public void setPdText2(String pdText2) {
+        this.pdText2 = pdText2;
     }
 
-    public void setUserDefined2(String userDefined2) {
-        this.userDefined2 = userDefined2;
+    public String getPdText3() {
+        return pdText3;
     }
 
-    public String getUserDefined3() {
-        return userDefined3;
+    public void setPdText3(String pdText3) {
+        this.pdText3 = pdText3;
     }
 
-    public void setUserDefined3(String userDefined3) {
-        this.userDefined3 = userDefined3;
+    public String getPdText4() {
+        return pdText4;
     }
 
-    public String getUserDefined4() {
-        return userDefined4;
+    public void setPdText4(String pdText4) {
+        this.pdText4 = pdText4;
     }
 
-    public void setUserDefined4(String userDefined4) {
-        this.userDefined4 = userDefined4;
+    public String getPdText5() {
+        return pdText5;
     }
 
-    public String getUserDefined5() {
-        return userDefined5;
+    public void setPdText5(String pdText5) {
+        this.pdText5 = pdText5;
     }
 
-    public void setUserDefined5(String userDefined5) {
-        this.userDefined5 = userDefined5;
+    public Double getPdYqty() {
+        return pdYqty;
     }
 
-    @Override
-    public String toString() {
-        return "PurchaseListDTO{" +
-                "id=" + id +
-                ", code='" + code + '\'' +
-                ", status='" + status + '\'' +
-                ", contactName='" + contactName + '\'' +
-                ", deliveryDate=" + deliveryDate +
-                ", docDate=" + docDate +
-                ", printStatus='" + printStatus + '\'' +
-                ", printTimes=" + printTimes +
-                ", userDefined1='" + userDefined1 + '\'' +
-                ", userDefined2='" + userDefined2 + '\'' +
-                ", userDefined3='" + userDefined3 + '\'' +
-                ", userDefined4='" + userDefined4 + '\'' +
-                ", userDefined5='" + userDefined5 + '\'' +
-                '}';
+    public void setPdYqty(Double pdYqty) {
+        this.pdYqty = pdYqty;
     }
+
+    protected long updaterId;
+
+    private  Integer puId;
+
+    private String puCode;
+
+    private Date puDate;
+
+    private Integer puVendid;
+
+    private String puVendcode;
+
+    private String puVendname;
+
+    private Integer puBuyerid;
+
+    private String puBuyercode;
+
+    private String puBuyername;
+
+    private Date puDelivery;
+
+    private Double puTaxtotal;
+
+    private Double puTotal;
+
+    private String puRemark;
+
+    private String puTotalupper;
+
+    private String puPrintstatus;
+
+    private String puPrintstatuscode;
+
+    private String puAcceptstatuscode;
+
+    private String puAcceptstatus;
+
+    private String puStatuscode;
+
+    private String puStatus;
+
+    private String puText1;
+
+    private String puText2;
+
+    private String puText3;
+
+    private String puText4;
+
+    private String puText5;
+
+    private String puShipaddresscode;
+
+    private Integer pdId;
+
+    private Integer pdPuid;
+
+    private String pdCode;
+
+    private Integer pdDetno;
+
+    private Integer pdProdid;
+
+    private String pdProdcode;
+
+    private String pdUnit;
+
+    private Double pdQty;
+
+    private Double pdPrice;
+
+    private Double pdTotal;
+
+    private Double pdTaxtotal;
+
+    private Double pdAcceptqty;
+
+    private Double pdDelivery;
+
+    private String pdSalecode;
+
+    private Integer pdSaledetno;
+
+    private Integer pdSdid;
+
+    private String pdText1;
+
+    private String pdText2;
+
+    private String pdText3;
+
+    private String pdText4;
+
+    private String pdText5;
+
+    private Double pdYqty;
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/Purchasedetail.java

@@ -3,7 +3,6 @@ package com.usoftchina.saas.purchase.po;
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class Purchasedetail extends CommonBaseEntity implements Serializable {
 
@@ -37,12 +36,6 @@ public class Purchasedetail extends CommonBaseEntity implements Serializable {
 
     private Integer pdSdid;
 
-    private Integer companyid;
-
-    private Integer updatemanid;
-
-    private Date updatedate;
-
     private String pdText1;
 
     private String pdText2;
@@ -175,30 +168,6 @@ public class Purchasedetail extends CommonBaseEntity implements Serializable {
         this.pdSdid = pdSdid;
     }
 
-    public Integer getCompanyid() {
-        return companyid;
-    }
-
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
-    }
-
-    public Integer getUpdatemanid() {
-        return updatemanid;
-    }
-
-    public void setUpdatemanid(Integer updatemanid) {
-        this.updatemanid = updatemanid;
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
     public String getPdText1() {
         return pdText1;
     }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/Status.java

@@ -0,0 +1,22 @@
+package com.usoftchina.saas.purchase.po;
+
+public enum Status {
+    /**
+     * 在录入
+     */
+    ENTERING("在录入"),
+
+    /**
+     * 已审核
+     */
+    AUDITED("已审核");
+
+    private String display;
+    private Status(String display){
+        this.display = display;
+    }
+
+    public String getDisplay(){
+        return display;
+    }
+}

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -44,7 +44,7 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param formdata
      * @return
      */
-    void saveFormData(PurchaseFormDTO formdata);
+    Long saveFormData(PurchaseFormDTO formdata);
 
     /**
      * 删除
@@ -65,8 +65,9 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
     /**
      * 删除明细
      *
-     * @param id
+     * @param formData
      * @return
      */
-    int audit(Integer id);
+    int audit(PurchaseFormDTO formData);
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -12,6 +12,8 @@ import com.usoftchina.saas.purchase.mapper.PurchasedetailMapper;
 import com.usoftchina.saas.purchase.po.*;
 import com.usoftchina.saas.purchase.service.PurchaseService;
 import com.usoftchina.saas.utils.BeanMapper;
+
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +37,11 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     @Override
     public PageInfo<PurchaseListDTO> getListData(PageRequest page, PurchaseReqDTO req) {
         //设置分页
+        if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
+            page = new PageRequest();
+            page.setNumber(1);
+            page.setSize(10);
+        }
         PageHelper.startPage(page.getNumber(), page.getSize());
         //查询数据
         List<PurchaseList> lists = purchaseListMapper.selectByCondition(req);
@@ -73,7 +80,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Override
-    public void saveFormData(PurchaseFormDTO formdata) {
+    public Long saveFormData(PurchaseFormDTO formdata) {
         //获取主表信息
         PurchaseDTO main = formdata.getMain();
         //转换实体类
@@ -81,7 +88,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         // TODO: 2018/10/11 字段处理...
         //插入对象
         purchaseMapper.insertSelective(purchase);
-        long pu_id = purchase.getId();
+        Long pu_id = purchase.getId();
         //获取从表信息
         List<PurchaseItemDTO> items = formdata.getItems();
         //添加从表传输对象
@@ -93,6 +100,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         //插入从表
         purchasedetailMapper.batchInsert(details);
+        return pu_id;
     }
 
     @Override
@@ -112,14 +120,32 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Override
-    public int audit(Integer id) {
-        Purchase purchase = new Purchase();
-        //生成对象
-        purchase.setId((long)id);
-        purchase.setPuStatus("已审核");
-        purchase.setPuStatuscode("AUDITED");
-        //更新存在字段
-        int affect = getMapper().updateByPrimaryKeySelective(purchase);
+    public int audit(PurchaseFormDTO formData) {
+        int affect = 0;
+        if (null != formData) {
+            String code = formData.getMain().getPuCode();
+            if (StringUtils.isEmpty(code)) {
+                return affect;
+            }
+            //查询是否存在该采购单
+            PurchaseExample purchaseExample = new PurchaseExample();
+            PurchaseExample.Criteria cta = purchaseExample.createCriteria();
+            cta.andPuCodeEqualTo(code);
+            int count = purchaseMapper.countByExample(purchaseExample);
+            Long id = null;
+            //不存在则保存
+            if (count == 0) {
+                id = saveFormData(formData);
+            }
+            Purchase purchase = new Purchase();
+            //生成更新对象
+            purchase.setId(id);
+            purchase.setPuStatus(Status.AUDITED.getDisplay());
+            purchase.setPuStatuscode(Status.AUDITED.name());
+            //更新存在字段
+            affect = purchaseMapper.updateByPrimaryKeySelective(purchase);
+        }
         return affect;
     }
+
 }

applications/purchase/purchase-server/src/main/resources/config/application-docker.yml

@@ -0,0 +1,7 @@
+eureka:
+  instance:
+    hostname: saas-purchase-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -2,22 +2,57 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.purchase.mapper.PurchaseListMapper">
     <resultMap id="BaseResultMap" type="com.usoftchina.saas.purchase.po.PurchaseList">
-        <id column="pu_id" jdbcType="BIGINT" property="id"/>
-        <result column="company_id" jdbcType="BIGINT" property="companyId"/>
-        <result column="pu_code" jdbcType="VARCHAR" property="code"/>
-        <result column="pu_status" jdbcType="VARCHAR" property="status"/>
-        <result column="PU_VENDNAME" jdbcType="VARCHAR" property="contactName"/>
-        <result column="PU_DELIVERY" jdbcType="TIMESTAMP" property="deliveryDate"/>
-        <result column="PU_DATE" jdbcType="TIMESTAMP" property="docDate"/>
-        <result column="PU_PRINTSTATUS" jdbcType="VARCHAR" property="printStatus"/>
-        <result column="pu_text1" jdbcType="VARCHAR" property="userDefined1"/>
-        <result column="pu_text2" jdbcType="VARCHAR" property="userDefined2"/>
-        <result column="pu_text3" jdbcType="VARCHAR" property="userDefined3"/>
-        <result column="pu_text4" jdbcType="VARCHAR" property="userDefined4"/>
-        <result column="pu_text5" jdbcType="VARCHAR" property="userDefined5"/>
-        <result column="PD_DETNO" property="pdDetno" jdbcType="DECIMAL" />
-        <result column="PD_PRODID" property="pdProdid" jdbcType="DECIMAL" />
+        <id column="pu_id" property="puId" jdbcType="INTEGER" />
+        <result column="pu_code" property="puCode" jdbcType="VARCHAR" />
+        <result column="pu_date" property="puDate" jdbcType="TIMESTAMP" />
+        <result column="pu_vendid" property="puVendid" jdbcType="INTEGER" />
+        <result column="PU_VENDCODE" property="puVendcode" jdbcType="VARCHAR" />
+        <result column="PU_VENDNAME" property="puVendname" jdbcType="VARCHAR" />
+        <result column="PU_BUYERID" property="puBuyerid" jdbcType="INTEGER" />
+        <result column="PU_BUYERCODE" property="puBuyercode" jdbcType="VARCHAR" />
+        <result column="PU_BUYERNAME" property="puBuyername" jdbcType="VARCHAR" />
+        <result column="PU_DELIVERY" property="puDelivery" jdbcType="TIMESTAMP" />
+        <result column="PU_TAXTOTAL" property="puTaxtotal" jdbcType="DOUBLE" />
+        <result column="PU_TOTAL" property="puTotal" jdbcType="DOUBLE" />
+        <result column="PU_REMARK" property="puRemark" jdbcType="VARCHAR" />
+        <result column="PU_TOTALUPPER" property="puTotalupper" jdbcType="VARCHAR" />
+        <result column="PU_INDATE" property="createTime" jdbcType="TIMESTAMP" />
+        <result column="PU_PRINTSTATUS" property="puPrintstatus" jdbcType="VARCHAR" />
+        <result column="PU_PRINTSTATUSCODE" property="puPrintstatuscode" jdbcType="VARCHAR" />
+        <result column="PU_ACCEPTSTATUSCODE" property="puAcceptstatuscode" jdbcType="VARCHAR" />
+        <result column="PU_ACCEPTSTATUS" property="puAcceptstatus" jdbcType="VARCHAR" />
+        <result column="PU_STATUSCODE" property="puStatuscode" jdbcType="VARCHAR" />
+        <result column="PU_STATUS" property="puStatus" jdbcType="VARCHAR" />
+        <result column="companyid" property="companyId" jdbcType="BIGINT" />
+        <result column="updatemanid" property="updaterId" jdbcType="INTEGER" />
+        <result column="updatedate" property="updateTime" jdbcType="TIMESTAMP" />
+        <result column="pu_text1" property="puText1" jdbcType="VARCHAR" />
+        <result column="pu_text2" property="puText2" jdbcType="VARCHAR" />
+        <result column="pu_text3" property="puText3" jdbcType="VARCHAR" />
+        <result column="pu_text4" property="puText4" jdbcType="VARCHAR" />
+        <result column="pu_text5" property="puText5" jdbcType="VARCHAR" />
+        <result column="PD_ID" property="pdId" jdbcType="INTEGER" />
+        <result column="PD_PUID" property="pdPuid" jdbcType="INTEGER" />
+        <result column="PD_CODE" property="pdCode" jdbcType="VARCHAR" />
+        <result column="PD_DETNO" property="pdDetno" jdbcType="INTEGER" />
+        <result column="PD_PRODID" property="pdProdid" jdbcType="INTEGER" />
         <result column="PD_PRODCODE" property="pdProdcode" jdbcType="VARCHAR" />
+        <result column="PD_UNIT" property="pdUnit" jdbcType="VARCHAR" />
+        <result column="PD_QTY" property="pdQty" jdbcType="DOUBLE" />
+        <result column="PD_PRICE" property="pdPrice" jdbcType="DOUBLE" />
+        <result column="PD_TOTAL" property="pdTotal" jdbcType="DOUBLE" />
+        <result column="PD_TAXTOTAL" property="pdTaxtotal" jdbcType="DOUBLE" />
+        <result column="PD_ACCEPTQTY" property="pdAcceptqty" jdbcType="DOUBLE" />
+        <result column="PD_DELIVERY" property="pdDelivery" jdbcType="DOUBLE" />
+        <result column="PD_SALECODE" property="pdSalecode" jdbcType="VARCHAR" />
+        <result column="PD_SALEDETNO" property="pdSaledetno" jdbcType="INTEGER" />
+        <result column="PD_SDID" property="pdSdid" jdbcType="INTEGER" />
+        <result column="pd_text1" property="pdText1" jdbcType="VARCHAR" />
+        <result column="pd_text2" property="pdText2" jdbcType="VARCHAR" />
+        <result column="pd_text3" property="pdText3" jdbcType="VARCHAR" />
+        <result column="pd_text4" property="pdText4" jdbcType="VARCHAR" />
+        <result column="pd_text5" property="pdText5" jdbcType="VARCHAR" />
+        <result column="pd_yqty" property="pdYqty" jdbcType="DOUBLE" />
     </resultMap>
 
     <select id="selectByCondition" parameterType="com.usoftchina.saas.purchase.dto.PurchaseReqDTO" resultMap="BaseResultMap">
@@ -32,6 +67,9 @@
             <if test="status != null">
                 AND pu_status=${status}
             </if>
+            <if test="keyword != null">
+                AND ${keyword}
+            </if>
         </where>
     </select>
 </mapper>

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -16,7 +16,7 @@
     <result column="PU_TOTAL" property="puTotal" jdbcType="DOUBLE" />
     <result column="PU_REMARK" property="puRemark" jdbcType="VARCHAR" />
     <result column="PU_TOTALUPPER" property="puTotalupper" jdbcType="VARCHAR" />
-    <result column="PU_INDATE" property="puIndate" jdbcType="TIMESTAMP" />
+    <result column="PU_INDATE" property="createTime" jdbcType="TIMESTAMP" />
     <result column="PU_PRINTSTATUS" property="puPrintstatus" jdbcType="VARCHAR" />
     <result column="PU_PRINTSTATUSCODE" property="puPrintstatuscode" jdbcType="VARCHAR" />
     <result column="PU_ACCEPTSTATUSCODE" property="puAcceptstatuscode" jdbcType="VARCHAR" />
@@ -139,11 +139,11 @@
     ,
     <include refid="Blob_Column_List" />
     from purchase
-    where pu_id = #{puId,jdbcType=INTEGER}
+    where pu_id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from purchase
-    where pu_id = #{puId,jdbcType=INTEGER}
+    where pu_id = #{id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.usoftchina.saas.purchase.po.PurchaseExample" >
     delete from purchase
@@ -163,14 +163,14 @@
       pu_text1, pu_text2, pu_text3, 
       pu_text4, pu_text5, PU_SHIPADDRESSCODE
       )
-    values (#{puId,jdbcType=INTEGER}, #{puCode,jdbcType=VARCHAR}, #{puDate,jdbcType=TIMESTAMP}, 
+    values (#{id,jdbcType=INTEGER}, #{puCode,jdbcType=VARCHAR}, #{puDate,jdbcType=TIMESTAMP},
       #{puVendid,jdbcType=INTEGER}, #{puVendcode,jdbcType=VARCHAR}, #{puVendname,jdbcType=VARCHAR}, 
       #{puBuyerid,jdbcType=INTEGER}, #{puBuyercode,jdbcType=VARCHAR}, #{puBuyername,jdbcType=VARCHAR}, 
       #{puDelivery,jdbcType=TIMESTAMP}, #{puTaxtotal,jdbcType=DOUBLE}, #{puTotal,jdbcType=DOUBLE}, 
-      #{puRemark,jdbcType=VARCHAR}, #{puTotalupper,jdbcType=VARCHAR}, #{puIndate,jdbcType=TIMESTAMP}, 
+      #{puRemark,jdbcType=VARCHAR}, #{puTotalupper,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
       #{puPrintstatus,jdbcType=VARCHAR}, #{puPrintstatuscode,jdbcType=VARCHAR}, #{puAcceptstatuscode,jdbcType=VARCHAR}, 
       #{puAcceptstatus,jdbcType=VARCHAR}, #{puStatuscode,jdbcType=VARCHAR}, #{puStatus,jdbcType=VARCHAR}, 
-      #{companyid,jdbcType=INTEGER}, #{updatemanid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
+      #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP},
       #{puText1,jdbcType=VARCHAR}, #{puText2,jdbcType=VARCHAR}, #{puText3,jdbcType=VARCHAR}, 
       #{puText4,jdbcType=VARCHAR}, #{puText5,jdbcType=VARCHAR}, #{puShipaddresscode,jdbcType=LONGVARCHAR}
       )
@@ -220,7 +220,7 @@
       <if test="puTotalupper != null" >
         PU_TOTALUPPER,
       </if>
-      <if test="puIndate != null" >
+      <if test="createTime != null" >
         PU_INDATE,
       </if>
       <if test="puPrintstatus != null" >
@@ -309,8 +309,8 @@
       <if test="puTotalupper != null" >
         #{puTotalupper,jdbcType=VARCHAR},
       </if>
-      <if test="puIndate != null" >
-        #{puIndate,jdbcType=TIMESTAMP},
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="puPrintstatus != null" >
         #{puPrintstatus,jdbcType=VARCHAR},
@@ -368,8 +368,8 @@
   <update id="updateByExampleSelective" parameterType="map" >
     update purchase
     <set >
-      <if test="record.puId != null" >
-        pu_id = #{record.puId,jdbcType=INTEGER},
+      <if test="record.id != null" >
+        pu_id = #{record.id,jdbcType=INTEGER},
       </if>
       <if test="record.puCode != null" >
         pu_code = #{record.puCode,jdbcType=VARCHAR},
@@ -410,8 +410,8 @@
       <if test="record.puTotalupper != null" >
         PU_TOTALUPPER = #{record.puTotalupper,jdbcType=VARCHAR},
       </if>
-      <if test="record.puIndate != null" >
-        PU_INDATE = #{record.puIndate,jdbcType=TIMESTAMP},
+      <if test="record.createTime != null" >
+        PU_INDATE = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.puPrintstatus != null" >
         PU_PRINTSTATUS = #{record.puPrintstatus,jdbcType=VARCHAR},
@@ -431,14 +431,14 @@
       <if test="record.puStatus != null" >
         PU_STATUS = #{record.puStatus,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyid = #{record.companyId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatemanid != null" >
-        updatemanid = #{record.updatemanid,jdbcType=INTEGER},
+      <if test="record.updaterId != null" >
+        updatemanid = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updatedate = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.puText1 != null" >
         pu_text1 = #{record.puText1,jdbcType=VARCHAR},
@@ -465,7 +465,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map" >
     update purchase
-    set pu_id = #{record.puId,jdbcType=INTEGER},
+    set pu_id = #{record.id,jdbcType=INTEGER},
       pu_code = #{record.puCode,jdbcType=VARCHAR},
       pu_date = #{record.puDate,jdbcType=TIMESTAMP},
       pu_vendid = #{record.puVendid,jdbcType=INTEGER},
@@ -479,16 +479,16 @@
       PU_TOTAL = #{record.puTotal,jdbcType=DOUBLE},
       PU_REMARK = #{record.puRemark,jdbcType=VARCHAR},
       PU_TOTALUPPER = #{record.puTotalupper,jdbcType=VARCHAR},
-      PU_INDATE = #{record.puIndate,jdbcType=TIMESTAMP},
+      PU_INDATE = #{record.createTime,jdbcType=TIMESTAMP},
       PU_PRINTSTATUS = #{record.puPrintstatus,jdbcType=VARCHAR},
       PU_PRINTSTATUSCODE = #{record.puPrintstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUSCODE = #{record.puAcceptstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUS = #{record.puAcceptstatus,jdbcType=VARCHAR},
       PU_STATUSCODE = #{record.puStatuscode,jdbcType=VARCHAR},
       PU_STATUS = #{record.puStatus,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updatemanid = #{record.updatemanid,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      companyid = #{record.companyId,jdbcType=INTEGER},
+      updatemanid = #{record.updaterId,jdbcType=INTEGER},
+      updatedate = #{record.updateTime,jdbcType=TIMESTAMP},
       pu_text1 = #{record.puText1,jdbcType=VARCHAR},
       pu_text2 = #{record.puText2,jdbcType=VARCHAR},
       pu_text3 = #{record.puText3,jdbcType=VARCHAR},
@@ -501,7 +501,7 @@
   </update>
   <update id="updateByExample" parameterType="map" >
     update purchase
-    set pu_id = #{record.puId,jdbcType=INTEGER},
+    set pu_id = #{record.id,jdbcType=INTEGER},
       pu_code = #{record.puCode,jdbcType=VARCHAR},
       pu_date = #{record.puDate,jdbcType=TIMESTAMP},
       pu_vendid = #{record.puVendid,jdbcType=INTEGER},
@@ -515,16 +515,16 @@
       PU_TOTAL = #{record.puTotal,jdbcType=DOUBLE},
       PU_REMARK = #{record.puRemark,jdbcType=VARCHAR},
       PU_TOTALUPPER = #{record.puTotalupper,jdbcType=VARCHAR},
-      PU_INDATE = #{record.puIndate,jdbcType=TIMESTAMP},
+      PU_INDATE = #{record.createTime,jdbcType=TIMESTAMP},
       PU_PRINTSTATUS = #{record.puPrintstatus,jdbcType=VARCHAR},
       PU_PRINTSTATUSCODE = #{record.puPrintstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUSCODE = #{record.puAcceptstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUS = #{record.puAcceptstatus,jdbcType=VARCHAR},
       PU_STATUSCODE = #{record.puStatuscode,jdbcType=VARCHAR},
       PU_STATUS = #{record.puStatus,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updatemanid = #{record.updatemanid,jdbcType=INTEGER},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      companyid = #{record.companyId,jdbcType=INTEGER},
+      updatemanid = #{record.updaterId,jdbcType=INTEGER},
+      updatedate = #{record.updateTime,jdbcType=TIMESTAMP},
       pu_text1 = #{record.puText1,jdbcType=VARCHAR},
       pu_text2 = #{record.puText2,jdbcType=VARCHAR},
       pu_text3 = #{record.puText3,jdbcType=VARCHAR},
@@ -576,8 +576,8 @@
       <if test="puTotalupper != null" >
         PU_TOTALUPPER = #{puTotalupper,jdbcType=VARCHAR},
       </if>
-      <if test="puIndate != null" >
-        PU_INDATE = #{puIndate,jdbcType=TIMESTAMP},
+      <if test="createTime != null" >
+        PU_INDATE = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="puPrintstatus != null" >
         PU_PRINTSTATUS = #{puPrintstatus,jdbcType=VARCHAR},
@@ -597,14 +597,14 @@
       <if test="puStatus != null" >
         PU_STATUS = #{puStatus,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyid = #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updatemanid != null" >
-        updatemanid = #{updatemanid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        updatemanid = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updatedate = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="puText1 != null" >
         pu_text1 = #{puText1,jdbcType=VARCHAR},
@@ -625,7 +625,7 @@
         PU_SHIPADDRESSCODE = #{puShipaddresscode,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where pu_id = #{puId,jdbcType=INTEGER}
+    where pu_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.purchase.po.Purchase" >
     update purchase
@@ -642,23 +642,23 @@
       PU_TOTAL = #{puTotal,jdbcType=DOUBLE},
       PU_REMARK = #{puRemark,jdbcType=VARCHAR},
       PU_TOTALUPPER = #{puTotalupper,jdbcType=VARCHAR},
-      PU_INDATE = #{puIndate,jdbcType=TIMESTAMP},
+      PU_INDATE = #{createTime,jdbcType=TIMESTAMP},
       PU_PRINTSTATUS = #{puPrintstatus,jdbcType=VARCHAR},
       PU_PRINTSTATUSCODE = #{puPrintstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUSCODE = #{puAcceptstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUS = #{puAcceptstatus,jdbcType=VARCHAR},
       PU_STATUSCODE = #{puStatuscode,jdbcType=VARCHAR},
       PU_STATUS = #{puStatus,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updatemanid = #{updatemanid,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      companyid = #{companyId,jdbcType=INTEGER},
+      updatemanid = #{updaterId,jdbcType=INTEGER},
+      updatedate = #{updateTime,jdbcType=TIMESTAMP},
       pu_text1 = #{puText1,jdbcType=VARCHAR},
       pu_text2 = #{puText2,jdbcType=VARCHAR},
       pu_text3 = #{puText3,jdbcType=VARCHAR},
       pu_text4 = #{puText4,jdbcType=VARCHAR},
       pu_text5 = #{puText5,jdbcType=VARCHAR},
       PU_SHIPADDRESSCODE = #{puShipaddresscode,jdbcType=LONGVARCHAR}
-    where pu_id = #{puId,jdbcType=INTEGER}
+    where pu_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.purchase.po.Purchase" >
     update purchase
@@ -675,21 +675,21 @@
       PU_TOTAL = #{puTotal,jdbcType=DOUBLE},
       PU_REMARK = #{puRemark,jdbcType=VARCHAR},
       PU_TOTALUPPER = #{puTotalupper,jdbcType=VARCHAR},
-      PU_INDATE = #{puIndate,jdbcType=TIMESTAMP},
+      PU_INDATE = #{createTime,jdbcType=TIMESTAMP},
       PU_PRINTSTATUS = #{puPrintstatus,jdbcType=VARCHAR},
       PU_PRINTSTATUSCODE = #{puPrintstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUSCODE = #{puAcceptstatuscode,jdbcType=VARCHAR},
       PU_ACCEPTSTATUS = #{puAcceptstatus,jdbcType=VARCHAR},
       PU_STATUSCODE = #{puStatuscode,jdbcType=VARCHAR},
       PU_STATUS = #{puStatus,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
-      updatemanid = #{updatemanid,jdbcType=INTEGER},
-      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      companyid = #{companyId,jdbcType=INTEGER},
+      updatemanid = #{updaterId,jdbcType=INTEGER},
+      updatedate = #{updateTime,jdbcType=TIMESTAMP},
       pu_text1 = #{puText1,jdbcType=VARCHAR},
       pu_text2 = #{puText2,jdbcType=VARCHAR},
       pu_text3 = #{puText3,jdbcType=VARCHAR},
       pu_text4 = #{puText4,jdbcType=VARCHAR},
       pu_text5 = #{puText5,jdbcType=VARCHAR}
-    where pu_id = #{puId,jdbcType=INTEGER}
+    where pu_id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

applications/purchase/purchase-server/src/main/resources/mapper/PurchasedetailMapper.xml

@@ -19,8 +19,8 @@
     <result column="PD_SALEDETNO" property="pdSaledetno" jdbcType="INTEGER" />
     <result column="PD_SDID" property="pdSdid" jdbcType="INTEGER" />
     <result column="companyid" property="companyId" jdbcType="INTEGER" />
-    <result column="updatemanid" property="updaterId" jdbcType="INTEGER" />
-    <result column="updatedate" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="pd_text1" property="pdText1" jdbcType="VARCHAR" />
     <result column="pd_text2" property="pdText2" jdbcType="VARCHAR" />
     <result column="pd_text3" property="pdText3" jdbcType="VARCHAR" />
@@ -89,7 +89,7 @@
   <sql id="Base_Column_List" >
     PD_ID, PD_PUID, PD_CODE, PD_DETNO, PD_PRODID, PD_PRODCODE, PD_UNIT, PD_QTY, PD_PRICE,
     PD_TOTAL, PD_TAXTOTAL, PD_ACCEPTQTY, PD_DELIVERY, PD_SALECODE, PD_SALEDETNO, PD_SDID,
-    companyid, updatemanid, updatedate, pd_text1, pd_text2, pd_text3, pd_text4, pd_text5,
+    companyId, updaterId, updateTime, pd_text1, pd_text2, pd_text3, pd_text4, pd_text5,
     pd_yqty
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.purchase.po.PurchasedetailExample" >
@@ -110,11 +110,11 @@
     select
     <include refid="Base_Column_List" />
     from purchasedetail
-    where PD_ID = #{pdId,jdbcType=INTEGER}
+    where PD_ID = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from purchasedetail
-    where PD_ID = #{pdId,jdbcType=INTEGER}
+    where PD_ID = #{id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.usoftchina.saas.purchase.po.PurchasedetailExample" >
     delete from purchasedetail
@@ -123,31 +123,28 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
-    insert into purchasedetail (PD_ID, PD_PUID, PD_CODE,
+    insert into purchasedetail (PD_PUID, PD_CODE,
     PD_DETNO, PD_PRODID, PD_PRODCODE,
     PD_UNIT, PD_QTY, PD_PRICE,
     PD_TOTAL, PD_TAXTOTAL, PD_ACCEPTQTY,
     PD_DELIVERY, PD_SALECODE, PD_SALEDETNO,
-    PD_SDID, companyid, updatemanid,
-    updatedate, pd_text1, pd_text2,
+    PD_SDID, companyId, updaterId,
+    updateTime, pd_text1, pd_text2,
     pd_text3, pd_text4, pd_text5,
     pd_yqty)
-    values (#{pdId,jdbcType=INTEGER}, #{pdPuid,jdbcType=INTEGER}, #{pdCode,jdbcType=VARCHAR},
+    values (#{pdPuid,jdbcType=INTEGER}, #{pdCode,jdbcType=VARCHAR},
     #{pdDetno,jdbcType=INTEGER}, #{pdProdid,jdbcType=INTEGER}, #{pdProdcode,jdbcType=VARCHAR},
     #{pdUnit,jdbcType=VARCHAR}, #{pdQty,jdbcType=DOUBLE}, #{pdPrice,jdbcType=DOUBLE},
     #{pdTotal,jdbcType=DOUBLE}, #{pdTaxtotal,jdbcType=DOUBLE}, #{pdAcceptqty,jdbcType=DOUBLE},
     #{pdDelivery,jdbcType=DOUBLE}, #{pdSalecode,jdbcType=VARCHAR}, #{pdSaledetno,jdbcType=INTEGER},
-    #{pdSdid,jdbcType=INTEGER}, #{companyid,jdbcType=INTEGER}, #{updatemanid,jdbcType=INTEGER},
-    #{updatedate,jdbcType=TIMESTAMP}, #{pdText1,jdbcType=VARCHAR}, #{pdText2,jdbcType=VARCHAR},
+    #{pdSdid,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
+    #{updateTime,jdbcType=TIMESTAMP}, #{pdText1,jdbcType=VARCHAR}, #{pdText2,jdbcType=VARCHAR},
     #{pdText3,jdbcType=VARCHAR}, #{pdText4,jdbcType=VARCHAR}, #{pdText5,jdbcType=VARCHAR},
     #{pdYqty,jdbcType=DOUBLE})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
     insert into purchasedetail
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="pdId != null" >
-        PD_ID,
-      </if>
       <if test="pdPuid != null" >
         PD_PUID,
       </if>
@@ -193,14 +190,14 @@
       <if test="pdSdid != null" >
         PD_SDID,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
-      <if test="updatemanid != null" >
-        updatemanid,
+      <if test="updaterId != null" >
+        updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
+      <if test="updateTime != null" >
+        updateTime,
       </if>
       <if test="pdText1 != null" >
         pd_text1,
@@ -222,9 +219,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="pdId != null" >
-        #{pdId,jdbcType=INTEGER},
-      </if>
       <if test="pdPuid != null" >
         #{pdPuid,jdbcType=INTEGER},
       </if>
@@ -270,14 +264,14 @@
       <if test="pdSdid != null" >
         #{pdSdid,jdbcType=INTEGER},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updatemanid != null" >
-        #{updatemanid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pdText1 != null" >
         #{pdText1,jdbcType=VARCHAR},
@@ -308,8 +302,8 @@
   <update id="updateByExampleSelective" parameterType="map" >
     update purchasedetail
     <set >
-      <if test="record.pdId != null" >
-        PD_ID = #{record.pdId,jdbcType=INTEGER},
+      <if test="record.id != null" >
+        PD_ID = #{record.id,jdbcType=INTEGER},
       </if>
       <if test="record.pdPuid != null" >
         PD_PUID = #{record.pdPuid,jdbcType=INTEGER},
@@ -356,14 +350,14 @@
       <if test="record.pdSdid != null" >
         PD_SDID = #{record.pdSdid,jdbcType=INTEGER},
       </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null" >
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatemanid != null" >
-        updatemanid = #{record.updatemanid,jdbcType=INTEGER},
+      <if test="record.updaterId != null" >
+        updaterId = #{record.updaterId,jdbcType=INTEGER},
       </if>
-      <if test="record.updatedate != null" >
-        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null" >
+        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.pdText1 != null" >
         pd_text1 = #{record.pdText1,jdbcType=VARCHAR},
@@ -390,7 +384,7 @@
   </update>
   <update id="updateByExample" parameterType="map" >
     update purchasedetail
-    set PD_ID = #{record.pdId,jdbcType=INTEGER},
+    set PD_ID = #{record.id,jdbcType=INTEGER},
     PD_PUID = #{record.pdPuid,jdbcType=INTEGER},
     PD_CODE = #{record.pdCode,jdbcType=VARCHAR},
     PD_DETNO = #{record.pdDetno,jdbcType=INTEGER},
@@ -406,9 +400,9 @@
     PD_SALECODE = #{record.pdSalecode,jdbcType=VARCHAR},
     PD_SALEDETNO = #{record.pdSaledetno,jdbcType=INTEGER},
     PD_SDID = #{record.pdSdid,jdbcType=INTEGER},
-    companyid = #{record.companyid,jdbcType=INTEGER},
-    updatemanid = #{record.updatemanid,jdbcType=INTEGER},
-    updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+    companyId = #{record.companyId,jdbcType=INTEGER},
+    updaterId = #{record.updaterId,jdbcType=INTEGER},
+    updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
     pd_text1 = #{record.pdText1,jdbcType=VARCHAR},
     pd_text2 = #{record.pdText2,jdbcType=VARCHAR},
     pd_text3 = #{record.pdText3,jdbcType=VARCHAR},
@@ -467,14 +461,14 @@
       <if test="pdSdid != null" >
         PD_SDID = #{pdSdid,jdbcType=INTEGER},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updatemanid != null" >
-        updatemanid = #{updatemanid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null" >
+        updateTime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pdText1 != null" >
         pd_text1 = #{pdText1,jdbcType=VARCHAR},
@@ -495,7 +489,7 @@
         pd_yqty = #{pdYqty,jdbcType=DOUBLE},
       </if>
     </set>
-    where PD_ID = #{pdId,jdbcType=INTEGER}
+    where PD_ID = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.purchase.po.Purchasedetail" >
     update purchasedetail
@@ -514,16 +508,16 @@
     PD_SALECODE = #{pdSalecode,jdbcType=VARCHAR},
     PD_SALEDETNO = #{pdSaledetno,jdbcType=INTEGER},
     PD_SDID = #{pdSdid,jdbcType=INTEGER},
-    companyid = #{companyid,jdbcType=INTEGER},
-    updatemanid = #{updatemanid,jdbcType=INTEGER},
-    updatedate = #{updatedate,jdbcType=TIMESTAMP},
+    companyId = #{companyId,jdbcType=INTEGER},
+    updaterId = #{updaterId,jdbcType=INTEGER},
+    updateTime = #{updateTime,jdbcType=TIMESTAMP},
     pd_text1 = #{pdText1,jdbcType=VARCHAR},
     pd_text2 = #{pdText2,jdbcType=VARCHAR},
     pd_text3 = #{pdText3,jdbcType=VARCHAR},
     pd_text4 = #{pdText4,jdbcType=VARCHAR},
     pd_text5 = #{pdText5,jdbcType=VARCHAR},
     pd_yqty = #{pdYqty,jdbcType=DOUBLE}
-    where PD_ID = #{pdId,jdbcType=INTEGER}
+    where PD_ID = #{id,jdbcType=INTEGER}
   </update>
   <insert id="batchInsert" parameterType="java.util.List" >
     insert into purchasedetail ( PD_PUID, PD_CODE,
@@ -531,8 +525,8 @@
     PD_UNIT, PD_QTY, PD_PRICE,
     PD_TOTAL, PD_TAXTOTAL, PD_ACCEPTQTY,
     PD_DELIVERY, PD_SALECODE, PD_SALEDETNO,
-    PD_SDID, companyid, updatemanid,
-    updatedate, pd_text1, pd_text2,
+    PD_SDID, companyId, updaterId,
+    updateTime, pd_text1, pd_text2,
     pd_text3, pd_text4, pd_text5,
     pd_yqty)
     values
@@ -543,8 +537,8 @@
       #{item.pdUnit,jdbcType=VARCHAR}, #{item.pdQty,jdbcType=DOUBLE}, #{item.pdPrice,jdbcType=DOUBLE},
       #{item.pdTotal,jdbcType=DOUBLE}, #{item.pdTaxtotal,jdbcType=DOUBLE}, #{item.pdAcceptqty,jdbcType=DOUBLE},
       #{item.pdDelivery,jdbcType=DOUBLE}, #{item.pdSalecode,jdbcType=VARCHAR}, #{item.pdSaledetno,jdbcType=INTEGER},
-      #{item.pdSdid,jdbcType=INTEGER}, #{item.companyid,jdbcType=INTEGER}, #{item.updatemanid,jdbcType=INTEGER},
-      #{item.updatedate,jdbcType=TIMESTAMP}, #{item.pdText1,jdbcType=VARCHAR}, #{item.pdText2,jdbcType=VARCHAR},
+      #{item.pdSdid,jdbcType=INTEGER}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.pdText1,jdbcType=VARCHAR}, #{item.pdText2,jdbcType=VARCHAR},
       #{item.pdText3,jdbcType=VARCHAR}, #{item.pdText4,jdbcType=VARCHAR}, #{item.pdText5,jdbcType=VARCHAR},
       #{item.pdYqty,jdbcType=DOUBLE}
       )

base-servers/account/account-server/src/main/resources/config/application-docker.yml

@@ -1,4 +1,7 @@
 eureka:
+  instance:
+    hostname: saas-account-server
+    prefer-ip-address: false
   client:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/

base-servers/gateway-server/src/main/resources/application.yml

@@ -68,6 +68,21 @@ zuul:
     sms:
       path: /sms/**
       serviceId: sms-server
+    purchase:
+      path: /purchase/**
+      serviceId: purchase-server
+    sale:
+      path: /sale/**
+      serviceId: sale-server
+    storage:
+      path: /storage/**
+      serviceId: storage-server
+    document:
+      path: /document/**
+      serviceId: document-server
+    money:
+      path: /money/**
+      serviceId: money-server                       
 info:
   name: '@project.artifactId@'
   description: '@project.description@'

frontend/saas-web/app/util/BaseUtil.js

@@ -5,16 +5,28 @@ Ext.define('saas.util.BaseUtil', {
      * @param url: 请求路径
      * @param params: 请求参数
      */
-    request: function(url, params) {
+    request: function (config) {
+        var url = config.url,
+            params = config.params,
+            async = config.async || true,
+            method = config.method || 'GET',
+            timeout = config.timeout || 8000;
+
         return new Ext.Promise(function (resolve, reject) {
             Ext.Ajax.request({
                 url: url,
                 params: params,
-                success: function(response, opts) {
+                async: async,
+                method: method,
+                timeout: timeout,
+                header: {
+                    'Access-Control-Allow-Origin': '*'
+                },
+                success: function (response, opts) {
                     resolve(response);
                 },
-                failure: function(response, opts) {
-                    console.log('server-side failure with status code ' + response.status);
+                failure: function (response, opts) {
+                    console.error('server-side failure with status code ' + response.status);
                     return reject(response);
                 }
             });

frontend/saas-web/app/util/FormUtil.js

@@ -1,18 +1,32 @@
 Ext.define('saas.util.FormUtil', {
 
     BaseUtil: Ext.create('saas.util.BaseUtil'),
+
+    /**
+     * 请求页面组件接口模板
+     */
+    baseUrl: 'http://192.168.0.181:8560/api/ui/co_view/config?name={xtype}',
     
     /**
      * 获得form的字段配置
      * @param form: form组件
      * @param url: url
      */
-    getFormItems: function(form, url, callback) {
-        this.BaseUtil.request(url)
+    getFormItems: function(form) {
+        var me = this,
+            xtype = form.xtype,
+            reg = /(.*){xtype}(.*)/g,
+            url = me.baseUrl.replace(reg, '$1' + xtype);
+        
+        this.BaseUtil.request({url})
         .then(function(response) {
-            var items = Ext.decode(response.responseText);
-            form.add(items);
-        }).catch(function(response) {
+            var res = Ext.decode(response.responseText);
+            if(res.success) {
+                var config = res.data;
+                form.add(config.items);
+            }
+        })
+        .catch(function(response) {
             console.log(response);
         });
     }

frontend/saas-web/app/util/GridUtil.js

@@ -8,7 +8,7 @@ Ext.define('saas.util.GridUtil', {
      * @param url 请求url
      */
     setColumns: function(grid, url) {
-        this.BaseUtil.request(url)
+        this.BaseUtil.request({url})
         .then(function(response) {
             var columns = Ext.decode(response.responseText);
             var fields = columns.map(column => column.dataIndex);
@@ -33,7 +33,7 @@ Ext.define('saas.util.GridUtil', {
      * @param url 请求url
      */
     loadData: function(grid, url) {
-        this.BaseUtil.request(url)
+        this.BaseUtil.request({url})
         .then(function(response) {
             var data = Ext.decode(response.responseText);
                 grid.getStore().loadData(data);

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -32,22 +32,20 @@ Ext.define('saas.view.core.form.FormPanel', {
         }, '->', {
             xtype: 'button',
             text: '新增',
+            handler: 'add'
         }, {
             xtype: 'button',
-            text: '保存'
+            text: '保存',
+            handler: 'save'
         }, {
             xtype: 'button',
-            text: '审核'
+            text: '审核',
+            handler: "audit"
         }]
     }],
 
     items: [],
+
+    remoteConfig: true // 是否需要从远端读取form配置
     
-    configUrl: '',
-    
-    initComponent: function() {
-        var me = this;
-        me.configUrl && me.FormUtil.getFormItems(me, me.configUrl);
-        me.callParent(arguments);
-    }
 });

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -2,5 +2,18 @@ Ext.define('saas.view.core.form.FormPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.core-form-formpanel',
 
-    
+    FormUtil: Ext.create('saas.util.FormUtil'),
+
+    init: function() {
+        var me = this,
+        form = me.getView(),
+        remoteConfig = form.remoteConfig;
+        
+        remoteConfig && me.FormUtil.getFormItems(form);
+    },
+
+    add: Ext.emptyFn,
+    save: Ext.emptyFn,
+    audit: Ext.emptyFn,
+
 });

frontend/saas-web/app/view/main/MainModel.js

@@ -47,6 +47,11 @@ Ext.define('saas.view.main.MainModel', {
                                         text: '测试-采购单明细界面',
                                         viewType: 'test-order-formpanel',
                                         leaf: true
+                                    }, {
+                                        id: 'myform',
+                                        text: '测试-明细界面',
+                                        viewType: 'test-myform-formpanel',
+                                        leaf: true
                                     },
                                     {
                                         id: 'ghdd',

frontend/saas-web/app/view/purchase/order/FormModel.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.purchase.order.FormModel', {
-    extend: 'Ext.app.ViewModel',
+    extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.purchase-order-formmodel',
 
     data: {

frontend/saas-web/app/view/purchase/panel/FormPanelController.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.purchase.panel.FormPanelController', {
-    extend: 'Ext.app.ViewController',
+    extend: 'saas.view.core.form.FormPanelController',
     alias: 'controller.purchase-panel-FormPanelController',
 
     control: {

frontend/saas-web/app/view/sale/salelist/FormController.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.sale.salelist.FormController', {
-    extend: 'Ext.app.ViewController',
+    extend: 'saas.view.core.grid.GridPanelController',
     alias: 'controller.saledetail',
 
 });

frontend/saas-web/app/view/sale/salelist/FormModel.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.sale.salelist.FormModel', {
-    extend: 'Ext.app.ViewModel',
+    extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.saledetail',
 
     formulas: {

frontend/saas-web/app/view/sale/salelist/GridController1.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.sale.salelist.GridController1', {
-    extend: 'Ext.app.ViewController',
+    extend: 'saas.view.core.grid.GridPanelController',
     alias: 'controller.salelist1',
 
     control: {

frontend/saas-web/app/view/sale/salelist/GridController2.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.sale.salelist.GridController2', {
-    extend: 'Ext.app.ViewController',
+    extend: 'saas.view.core.grid.GridPanelController',
     alias: 'controller.salelist2',
 
     listen: {

frontend/saas-web/app/view/test/myform/FormPanel.js

@@ -0,0 +1,12 @@
+
+Ext.define('saas.view.test.myform.FormPanel',{
+    extend: 'saas.view.core.form.FormPanel',
+    xtype: 'test-myform-formpanel',
+
+    controller: 'test-myform-formpanel',
+    viewModel: {
+        type: 'test-myform-formpanel'
+    },
+
+    configUrl: 'http://192.168.0.181:8560/api/ui/co_view/config?name=purchase.list',
+});

frontend/saas-web/app/view/test/myform/FormPanelController.js

@@ -0,0 +1,5 @@
+Ext.define('saas.view.test.myform.FormPanelController', {
+    extend: 'saas.view.core.form.FormPanelController',
+    alias: 'controller.test-myform-formpanel'
+
+});

frontend/saas-web/app/view/test/myform/FormPanelModel.js

@@ -0,0 +1,9 @@
+Ext.define('saas.view.test.myform.FormPanelModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.test-myform-formpanel',
+    
+    data: {
+        name: 'saas'
+    }
+
+});

frontend/saas-web/app/view/test/order/FormModel.js

@@ -1,5 +1,5 @@
 Ext.define('saas.view.test.order.FormModel', {
-    extend: 'Ext.app.ViewModel',
+    extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.test-order-formmodel',
 
     data: {

frontend/saas-web/resources/json/formItems.json

@@ -1,77 +1,85 @@
-[ {
-    "xtype": "dbfindtrigger",
-    "configUrl":"resources/json/purchase/vendorColumnsDbfind.json",
-    "dataUrl":"resources/json/purchase/vendorDataDbfind.json",   
-    "name": "pu_vendorcode",
-    "bind": "{pu_vendorcode}",
-    "fieldLabel": "供应商编号",
-    "allowBlank": true,
-    "columnWidth": 0.25
-}, {
-    "xtype": "textfield",
-    "name": "pu_vendorname",
-    "bind": "{pu_vendorname}",
-    "fieldLabel": "供应商简称",
-    "allowBlank": true,
-    "columnWidth": 0.25
-}, {
-    "xtype": "textfield",
-    "name": "text",
-    "bind": "{text}",
-    "fieldLabel": "文本",
-    "allowBlank": true,
-    "columnWidth": 1
-}, {
-    "xtype": "numberfield",
-    "name": "num1",
-    "bind": "{num1}",
-    "fieldLabel": "加数",
-    "allowBlank": false,
-    "columnWidth": 0.5
-}, {
-    "xtype": "numberfield",
-    "name": "num2",
-    "bind": "{num2}",
-    "fieldLabel": "加数",
-    "allowBlank": false,
-    "columnWidth": 0.5
-}, {
-    "xtype": "numberfield",
-    "name": "sum",
-    "bind": "{sum}",
-    "fieldLabel": "和",
-    "allowBlank": false,
-    "columnWidth": 1
-}, {
-    "xtype": "detailGridField",
-    "columnWidth": 1,
-    "configUrl": "resources/json/detailGridColumns1.json"
-}, {
-    "xtype": "datefield",
-    "name": "createTime",
-    "bind": "{createTime}",
-    "fieldLabel": "制单日期",
-    "allowBlank": true,
-    "columnWidth": 0.25 
-}, {
-    "xtype": "textfield",
-    "name": "creator",
-    "bind": "{creator}",
-    "fieldLabel": "制单人",
-    "allowBlank": true,
-    "columnWidth": 0.25 
-}, {
-    "xtype": "textfield",
-    "name": "field1",
-    "bind": "{field1}",
-    "fieldLabel": "field1",
-    "allowBlank": true,
-    "columnWidth": 1 
-}, {
-    "xtype": "textfield",
-    "name": "field2",
-    "bind": "{field2}",
-    "fieldLabel": "field2",
-    "allowBlank": true,
-    "columnWidth": 1 
-}]
+{
+    "success": true,
+    "code": 0,
+    "message": null,
+    "data": {
+        "xtype": "formpanel",
+        "items": [ {
+            "xtype": "dbfindtrigger",
+            "configUrl":"resources/json/purchase/vendorColumnsDbfind.json",
+            "dataUrl":"resources/json/purchase/vendorDataDbfind.json",   
+            "name": "pu_vendorcode",
+            "bind": "{pu_vendorcode}",
+            "fieldLabel": "供应商编号",
+            "allowBlank": true,
+            "columnWidth": 0.25
+        }, {
+            "xtype": "textfield",
+            "name": "pu_vendorname",
+            "bind": "{pu_vendorname}",
+            "fieldLabel": "供应商简称",
+            "allowBlank": true,
+            "columnWidth": 0.25
+        }, {
+            "xtype": "textfield",
+            "name": "text",
+            "bind": "{text}",
+            "fieldLabel": "文本",
+            "allowBlank": true,
+            "columnWidth": 1
+        }, {
+            "xtype": "numberfield",
+            "name": "num1",
+            "bind": "{num1}",
+            "fieldLabel": "加数",
+            "allowBlank": false,
+            "columnWidth": 0.5
+        }, {
+            "xtype": "numberfield",
+            "name": "num2",
+            "bind": "{num2}",
+            "fieldLabel": "加数",
+            "allowBlank": false,
+            "columnWidth": 0.5
+        }, {
+            "xtype": "numberfield",
+            "name": "sum",
+            "bind": "{sum}",
+            "fieldLabel": "和",
+            "allowBlank": false,
+            "columnWidth": 1
+        }, {
+            "xtype": "detailGridField",
+            "columnWidth": 1,
+            "configUrl": "resources/json/detailGridColumns1.json"
+        }, {
+            "xtype": "datefield",
+            "name": "createTime",
+            "bind": "{createTime}",
+            "fieldLabel": "制单日期",
+            "allowBlank": true,
+            "columnWidth": 0.25 
+        }, {
+            "xtype": "textfield",
+            "name": "creator",
+            "bind": "{creator}",
+            "fieldLabel": "制单人",
+            "allowBlank": true,
+            "columnWidth": 0.25 
+        }, {
+            "xtype": "textfield",
+            "name": "field1",
+            "bind": "{field1}",
+            "fieldLabel": "field1",
+            "allowBlank": true,
+            "columnWidth": 1 
+        }, {
+            "xtype": "textfield",
+            "name": "field2",
+            "bind": "{field2}",
+            "fieldLabel": "field2",
+            "allowBlank": true,
+            "columnWidth": 1 
+        }]        
+    }
+}

frontend/saas-web/resources/json/purchase/formItems.json

@@ -1,36 +1,44 @@
-[{
-    "xtype": "textfield",
-    "name": "pu_code",
-    "bind": "{pu_code}",
-    "fieldLabel": "采购单号",
-    "allowBlank": true,
-    "columnWidth": 0.25
-}, {
-    "xtype": "textfield",
-    "name": "pu_kind",
-    "bind": "{pu_kind}",
-    "fieldLabel": "采购类型",
-    "allowBlank": true,
-    "columnWidth": 0.25
-}, {
-    "xtype": "dbfindtrigger",
-    "configUrl":"resources/json/purchase/vendorColumnsDbfind.json",
-    "dataUrl":"resources/json/purchase/vendorDataDbfind.json",
-    
-    "name": "pu_vendorcode",
-    "bind": "{pu_vendorcode}",
-    "fieldLabel": "供应商编号",
-    "allowBlank": true,
-    "columnWidth": 0.25
-}, {
-    "xtype": "textfield",
-    "name": "pu_vendorname",
-    "bind": "{pu_vendorname}",
-    "fieldLabel": "供应商简称",
-    "allowBlank": true,
-    "columnWidth": 0.25
-}, {
-    "xtype": "purchase-panel-GridPanel",
-    "allowBlank": true,
-    "columnWidth":1
-}]
+{
+    "success": true,
+    "code": 0,
+    "message": null,
+    "data": {
+        "xtype": "formpanel",
+        "items": [{
+            "xtype": "textfield",
+            "name": "pu_code",
+            "bind": "{pu_code}",
+            "fieldLabel": "采购单号",
+            "allowBlank": true,
+            "columnWidth": 0.25
+        }, {
+            "xtype": "textfield",
+            "name": "pu_kind",
+            "bind": "{pu_kind}",
+            "fieldLabel": "采购类型",
+            "allowBlank": true,
+            "columnWidth": 0.25
+        }, {
+            "xtype": "dbfindtrigger",
+            "configUrl":"resources/json/purchase/vendorColumnsDbfind.json",
+            "dataUrl":"resources/json/purchase/vendorDataDbfind.json",
+            
+            "name": "pu_vendorcode",
+            "bind": "{pu_vendorcode}",
+            "fieldLabel": "供应商编号",
+            "allowBlank": true,
+            "columnWidth": 0.25
+        }, {
+            "xtype": "textfield",
+            "name": "pu_vendorname",
+            "bind": "{pu_vendorname}",
+            "fieldLabel": "供应商简称",
+            "allowBlank": true,
+            "columnWidth": 0.25
+        }, {
+            "xtype": "purchase-panel-GridPanel",
+            "allowBlank": true,
+            "columnWidth":1
+        }]
+    }
+}