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

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java

@@ -64,4 +64,11 @@ public class MesWorkCenter extends BaseBean {
     @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
+
+    public MesWorkCenter(String organizeCode) {
+        this.organizeCode = organizeCode;
+    }
+
+    public MesWorkCenter() {
+    }
 }

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.andon.sqlpack;
 
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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 org.apache.commons.lang3.StringUtils;
+
 /**
  * @Description : 安灯对象查询封装
  * @Reference :
@@ -8,4 +16,51 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
  * @Modify:
  **/
 public class AndonHqlPack {
+    /**
+     * 封装公用查询参数
+     *
+     * @param bean   实体对象
+     * @param hqlStr 查询语句
+     * @return 封装完成的查询语句
+     */
+    public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
+
+        // 判断工厂代码是否为空
+        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
+        }
+
+        // 封装有效状态和删除状态
+        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+
+        return hqlStr;
+    }
+
+    /**
+     * 按条件查询工作中心
+     * @param mesWorkCenter
+     * @return
+     */
+    public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(mesWorkCenter, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询工作单元（工位）
+     * @param mesWorkCell
+     * @return
+     */
+    public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(mesWorkCell, result);
+
+        return result;
+    }
 }

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

@@ -66,8 +66,11 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @Column(name = "UNIT")
     private String unit;
 
+    /**
+     * 不冗余主表数据
+     */
     @ApiParam(value = "行项目状态", example = "1")
-    @Column(name = "ITEM_STATUS")
+    @Transient
     private Integer itemStatus;
 
     @Column(name = "BOX_QTY")
@@ -131,7 +134,10 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("是否为钢卷料")
     private Integer isSteel;
 
-    @Column(name = "EXPECTED_TIME")
+    /**
+     * 不冗余主表数据
+     */
+    @Transient
     @ApiParam(value = "预计到货日期")
     public String expectedTime;
 

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

@@ -34,6 +34,14 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam("单据明细编号")
     private String orderNo;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "PART_NO")
     @ApiParam(value = "零件号")
     private String partNo;

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

@@ -20,6 +20,9 @@ public class SwebLoginUserModel implements Serializable {
     @ApiParam(value = "用户ID")
     private Long id;
 
+    @ApiParam(value = "用户code（供应商编号）")
+    private String code;
+
     @ApiParam(value = "用户名")
     private String userName;
 

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

@@ -23,6 +23,9 @@ public class SwebPOForPubListEnterModel extends BaseBean {
     @ApiParam(value = "订单类型", example = "1")
     public Integer orderType;
 
+    @ApiParam(value = "订单状态", example = "10")
+    public Integer orderStatus;
+
     @ApiParam(value = "预计到货日期开始日期")
     public String expectedTimeStart;
 

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 待发布订单列表发布输入模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-05-13 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOUpdatePublishForPublishModel extends BaseBean {
+
+    @ApiParam(value = "拆分请求时间数量列表", example = "1")
+    private List<String> reqTimeList;
+
+    @ApiParam(value = "列表项", example = "1")
+    private SwebPOForPubListResultItemModel item;
+}