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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -129,6 +130,9 @@ public class WorkPlan extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long furnacePlanId;
 
+    @Transient
+    private boolean hasCominbed = false;
+
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {

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

@@ -28,4 +28,5 @@ public class ReportPager extends APSPager {
     private Date end;       // 统计结束时间
     private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
     private ApsEnumUtil.REPORT_TIME_SPAN span;  // 统计时间间隔
+    private String shiftCode;
 }

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

@@ -507,6 +507,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "颜色")
     private String color;
 
+    @Transient
+    @ApiParam(value = "单据")
+    private String orderNo;
+
     public WmsStockSn() {
     }
 
@@ -753,7 +757,7 @@ public class WmsStockSn extends BaseBean {
                       String shippingFlag, String workCenterCode, Integer snType,
                       String packagePartNo, Integer useCount, Integer seqNo,
                       String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
-                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) {
+                      String prodCfgTypeName, String custNameRdd, String workOrderCode, String color, String orderNo) {
         this.organizeCode = organizeCode;
         this.id = id;
         this.sn = sn;
@@ -801,6 +805,7 @@ public class WmsStockSn extends BaseBean {
         this.custNameRdd = custNameRdd;
         this.workOrderCode = workOrderCode;
         this.color = color;
+        this.orderNo = orderNo;
     }
 
     public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) {