Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.model;
 
-import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.Api;
 import lombok.Data;
 
@@ -16,9 +19,12 @@ import java.util.Date;
  **/
 @Data
 @Api("报表分页查询参数")
-public class ReportPager extends Pager {
-    private String filter;  // 物料筛选条件
+public class ReportPager extends APSPager {
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date begin;     // 统计开始时间
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date end;       // 统计结束时间
     private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
     private ApsEnumUtil.REPORT_TIME_SPAN span;  // 统计时间间隔

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class StatisticReportReponse {
+    private List<String> headers = new ArrayList<>();
+    private List<Map<String, String>> datas = new ArrayList<>();
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -84,7 +84,6 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MATERIAL_REPORT_TYPE {
-        PRODUCE("PRODUCE", "生产"),
         PURCHASE("PURCHASE", "采购"),
         INVENTORY("INVENTORY", "库存");
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -69,10 +69,6 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String vendorEmail;
 
-    @ApiParam(value = "标题")
-    @Transient
-    public String title;
-
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -147,6 +147,9 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("批次")
+    public String lotNo;
     @Transient
     @ApiParam("实际批次")
     private String actualLot;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -175,6 +175,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号")
     public String partNo;
 
+    @ApiParam(value = "标题")
+    @Transient
+    public String title;
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java

@@ -42,6 +42,10 @@ public class WmsVendorPart extends BaseBean {
     @ApiParam(value = "供应商物料号")
     private String vendorPartNo;
 
+    @Column(name = "MAX_AMOUNT")
+    @ApiParam(value = "供应商月提供最大数量")
+    private Double maxAmount;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;