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

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :工步
@@ -46,4 +47,13 @@ public class MesStep extends BaseBean {
     @Column(name = "STEP_OBJECT")
     @ApiParam("工步对象")
     private String stepObject;
+
+    @Transient
+    @ApiParam("工步执行完毕")
+    private boolean isComplete;
+
+    @Transient
+    @ApiParam("工步是否跳过")
+    private boolean isJump;
+
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java

@@ -16,12 +16,18 @@ import java.io.Serializable;
 @Data
 public class StationRequestBean implements Serializable {
 
+    @ApiParam("扫描信息")
+    private String scanInfo;
+
     @ApiParam("产品条码")
     private String serialNumber;
 
     @ApiParam("物料号")
     private String partNo;
 
+    @ApiParam("组织代码")
+    private String organizeCode;
+
     @ApiParam("工作中心代码")
     private String workCenterCode;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : 工位结果bean
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-24
+ * @Modify:
+ **/
+@Data
+public class StationResultBean implements Serializable {
+
+    /**
+     * 根据客户端所需数据结构，约定不同数据类型
+     */
+    @ApiParam("数据类型")
+    private String flagType;
+
+    @ApiParam("是否错误信息")
+    private boolean fail;
+
+    @ApiParam("执行结果信息")
+    private String message;
+
+    @ApiParam("工步展示信息")
+    private String stepHtml;
+
+    @ApiParam("工步清单")
+    private List<MesStep>  stepList;
+}

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

@@ -23,8 +23,8 @@ public class WmsTaskInfoModel implements Serializable {
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
-    @ApiParam(value = "任务状态", example = "1")
-    public Integer taskStatus;
+    @ApiParam(value = "任务状态")
+    public String taskStatus;
 
     @ApiParam("作业类型名称")
     public String opTypeName;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -63,6 +63,14 @@ public class SwebHqlPack {
         return buildHql(swebPackage, result);
     }
 
+    public static DdlPackBean getConfigWhereHql(SwebConfig swebConfig) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result);
+        DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(swebConfig, result);
+    }
+
     public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1019,6 +1019,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result);
@@ -1429,7 +1430,7 @@ public class WmsHqlPack {
     public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
-        getStringBuilderPack(wmsStockSn, result);
+        HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
         HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         return result.toString();
     }
@@ -1514,12 +1515,12 @@ public class WmsHqlPack {
      * 给定字段动态in sql
      *
      * @param columnName
-     * @param orderNo
+     * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , String orderNo) {
+    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List<String> orderList) {
         DdlPackBean packBean = new DdlPackBean();
-        DdlPreparedPack.getInPack(orderNo, columnName, packBean);
+        DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);