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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -439,11 +439,10 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packHqlAndonConfig(AndonConfig andonConfig){
         DdlPackBean result = new DdlPackBean();
-
         DdlPreparedPack.getStringEqualPack(andonConfig.getConfigCode(), "configCode", result);
-
+        DdlPreparedPack.getNumEqualPack(andonConfig.getConfigGroup(), "configGroup", result);
+        DdlPreparedPack.getNumEqualPack(andonConfig.getConfigType(), "configType", result);
         getStringBuilderPack(andonConfig, result);
-
         return result;
     }
 

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class GanttCalendarModel {
+    @Data
+    public static class Block {
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date beginTime;
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date endTime;
+        private Boolean onDuty;
+    }
+    private Long resourceId;
+    private List<Block> timeBlocks = new ArrayList<>();
+}

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

@@ -93,6 +93,10 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("默认收货库存地")
     private String erpAreaNoAdd;
 
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
     @ApiParam(value = "供应商名称")
     @Transient
     public String vendorNameRdd;

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

@@ -81,4 +81,8 @@ public class WmsQCTrans extends BaseBean {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
     public String qcTime;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
 }