Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -178,4 +179,8 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @Column(name = "REF_NO")
     @ApiParam(value = "合同号")
     private String refNo;
+
+    @Transient
+    @ApiParam(value = "关联单号")
+    private String refOrderNo;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.pojo.sweb.modelbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 订单批量新增输入模型
@@ -34,6 +36,12 @@ public class SwebPOBatchInsertEnterModel extends BaseBean {
     @ApiParam(value = "合同号")
     private String refNo;
 
+    @ApiParam(value = "是否导入使用")
+    private boolean isImport;
+
+    @ApiParam(value = "订单主表对应日期缓存")
+    private Map<String,SwebPurchaseOrder> dayOrderCache;
+
     @ApiParam(value = "零件列表")
     private List<SwebPOBatchInsertItemEnterModel> partItems;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java

@@ -34,6 +34,10 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
     @Column(name = "VENDOR_NAME")
     private String vendorName;
 
+    @Column(name = "REF_NO")
+    @ApiParam(value = "合同号")
+    private String refNo;
+
     @Column(name = "PART_NAME")
     @ApiParam(value = "零件名称")
     private String partName;