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

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

@@ -36,12 +36,12 @@ import java.util.List;
 public class Work extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="编码")
-    @FieldAnnotation(popSearch = true, mainkey = true)
+    @FieldAnnotation(popSearch = true, mainkey = true, modify = false)
     private String code;
 
     @Column(name="ORDER_ID")
     @ApiParam(value ="订单")
-    @FieldAnnotation(relation = "Order")
+    @FieldAnnotation(relation = "Order", modify = false)
     private Long orderId;
 
     @Column(name="WORK_TYPE")
@@ -77,9 +77,10 @@ public class Work extends BaseAPS {
     @ApiParam(value ="指定数量")
     private Double specifyCount;
 
-    @Column(name="SPECIFY_RESOURCE")
+    @Column(name="SPECIFY_RESOURCE_ID")
-    @ApiParam(value ="指定资源")
+    @ApiParam(value ="指定主资源")
-    private String specifyResource;
+    @FieldAnnotation(relation = "SpecifyResource")
+    private Long specifyResourceId;
 
     @Column(name="SPECIFY_PRODUCE_TIME")
     @ApiParam(value ="指定制造时间")
@@ -223,4 +224,13 @@ public class Work extends BaseAPS {
 
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); }
+
+    public Resource getSpecifyResource() {
+        return BeanRelation.get(this, EWork.SpecifyResource);
+    }
+
+    public void setSpecifyResource(Resource resource) {
+        this.specifyResourceId = resource != null ? resource.getId() : 0;
+        BeanRelation.set(this, EWork.SpecifyResource, resource);
+    }
 }

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

@@ -113,6 +113,11 @@ public class WorkPlan extends BaseAPS {
     @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer lockTime;
 
+    @Column(name="FORCE_POST_SET_ZERO")
+    @ApiParam(value ="是否将后设置时间强制设置成0")
+    @FieldAnnotation(property = false)
+    private Boolean forcePostSetZero;
+
     @Column(name="WORK_RESOURCE_ID")
     @ApiParam(value ="工作资源对象id")
     @FieldAnnotation(property = false)

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

@@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS {
 
     @Column(name="MATERIAL_ID")
     @ApiParam(value ="物料")
-    @FieldAnnotation(relation = "Material")
+    @FieldAnnotation(relation = "Material", modify = false)
     private Long materialId;
 
     @Column(name="PREV_ORDER_ID")
     @ApiParam(value ="前订单")
-    @FieldAnnotation(relation = "PrevOrder")
+    @FieldAnnotation(relation = "PrevOrder", modify = false)
     private Long prevOrderId;
 
     @Column(name="POST_ORDER_ID")
     @ApiParam(value ="后订单")
-    @FieldAnnotation(relation = "PostOrder")
+    @FieldAnnotation(relation = "PostOrder", modify = false)
     private Long postOrderId;
 
     @Column(name="PREV_WORK_ID")
     @ApiParam(value ="前工作")
-    @FieldAnnotation(relation = "PrevWork")
+    @FieldAnnotation(relation = "PrevWork", modify = false)
     private Long prevWorkId;
 
     @Column(name="POST_WORK_ID")
     @ApiParam(value ="后工作")
-    @FieldAnnotation(relation = "PostWork")
+    @FieldAnnotation(relation = "PostWork", modify = false)
     private Long postWorkId;
 
     @Column(name="COUNT", columnDefinition = "decimal(18,8)")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java

@@ -12,4 +12,5 @@ public enum EWork {
     PlanFeedbacks,  // 工作计划反馈
     MainPlan,    // 关联的为主资源的计划
     WorkPlans,   // 关联的工作计划
+    SpecifyResource, // 指定资源
 }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class GanttOrderModel {
+    private Long id;
+    private String code;
+    private String name;
+    private List<GanttOrderModel> children = new ArrayList<>();
+}

modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml

@@ -18,4 +18,6 @@
     </Relation>
     <Relation field="PlanFeedbacks" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
     </Relation>
+    <Relation field="SpecifyResource" name="Resource" type="MULTI_TO_ONE">
+    </Relation>
 </Class>

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java

@@ -80,7 +80,8 @@ public class MesQcCheckStandard extends BaseBean {
     public MesQcCheckStandard() {
     }
 
-    public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
+    public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
+        this.id = id;
         this.partNo = partNo;
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
@@ -90,6 +91,7 @@ public class SuitClientModel {
     /**
      * 适配报文
      */
+    @JsonIgnore
     @XStreamCDATA
     private Object suitResultMessage;
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -4,19 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
+import cn.estsh.i3plus.pojo.softswitch.bean.*;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
-import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
 
 /**
  * @Description :
@@ -415,7 +403,6 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
-
     public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
@@ -426,4 +413,12 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -64,4 +64,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam("关联单号")
     private String refOrderNo;
+
+    @ApiParam("开始时间")
+    private String createDateTimeStart;
+
+    @ApiParam("结束时间")
+    private String createDateTimeEnd;
 }