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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -925,8 +925,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
-        FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
+        CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"),
+        FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
 
         private int value;
         private int code;
@@ -981,7 +981,6 @@ public class WmsEnumUtil {
 
     /**
      * 业务表：库存条码状态
-     * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
@@ -991,7 +990,6 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        //SCRAP(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -4656,7 +4654,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 计划拉动明细表状态创建
+     * 计划拉动主表状态创建
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -40,6 +40,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
     @ApiParam("流程代码")
     private String routeCode;
 

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

@@ -48,7 +48,9 @@ public class SuitClientModel {
     /**
      * 适配结果信息
      */
+    @XStreamCDATA
     private String suitMessage;
+
     /**
      * 请求来源
      */

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

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -44,6 +43,7 @@ public class SuitServerModel {
      * 适配结果信息
      */
 //    @XStreamImplicit
+    @XStreamCDATA
     private String suitMessage;
 
     /**

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -54,6 +54,9 @@ public class SessionUser implements Serializable {
     @ApiParam("列表默认分页数量")
     private Integer pageDefaultSize;
 
+    @ApiParam("文件展示地址")
+    private String fileViewUrl;
+
     public SessionUser() {
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -81,9 +81,10 @@ public class CoreHqlPack {
 
         if(resource != null){
             DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
+            DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
             DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
             DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
-            DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result);
+            DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result);
             DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result);
         }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -98,6 +98,19 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配结果")
     private Integer suitResult;
 
+    @Column(name = "SUIT_START_DATE_TIME")
+    @ApiParam(value = "适配开始时间")
+    private String suitStartTime;
+
+    @Column(name = "SUIT_END_DATE_TIME")
+    @ApiParam(value = "适配结束时间")
+    private String suitEndTime;
+
+    @Column(name = "EXECUTE_TIME")
+    @ApiParam(value = "执行耗时")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long executeTime;
+
     @Lob
     @Column(name = "SUIT_MESSAGE")
     @ApiParam(value = "适配信息")

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

@@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean {
 
     @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false)
     @ApiParam(value = "是否自动开窗")
+    @AnnoOutputColumn
     private Integer isAutoOpenWindow;
 
     @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")

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

@@ -119,6 +119,19 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "物料数量", example = "1")
     public Double sumPartQty;
 
+    /**
+     * 条码状态:1=创建,10=已收货,20=已质检,
+     * 30=已入库,40=待出库,50=已出库,
+     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     */
+    @Transient
+    @ApiParam(value = "条码状态", example = "1")
+    public Integer snStatus;
+
+    @Transient
+    @ApiParam(value = "条码状态(冻结时)", example = "1")
+    public Integer destSnStatus;
+
     @Transient
     @ApiParam("存储区编号组")
     public String[] zoneNos;

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

@@ -93,6 +93,11 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
+    @Column(name = "DEST_SN_STATUS")
+    @ApiParam(value = "条码状态(冻结时)", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer destSnStatus;
+
     /**
      * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
      */

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

@@ -205,6 +205,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
     private Integer printStatus;
 
+    @Transient
+    @ApiParam("优先级")
+    private String priority;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }

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

@@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{
 
     @Column(name="WROKORDER_NO")
     @ApiParam("工单号")
-    private String wrokorderNo;
+    private String woekorderNo;
 
     @Column(name="ITEM")
     @ApiParam(value = "行号", example = "0")
@@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{
     private Double bootLotNo = 0d;
 
     @Column(name="ORDER_STATUS")
-    @ApiParam(value = "单据状态", example = "0")
+    @ApiParam(value = "明细状态", example = "0")
     private Integer orderStatus = 0;
 
     public Integer getOrderStatus() {

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

@@ -53,8 +53,6 @@ public class WmsRouting extends BaseBean {
 
     @Column(name = "FOR_PRODUCT")
     @ApiParam(value = "适用产品")
-    
-     
     private Integer forProduct;
 
 	@Transient

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

@@ -2618,7 +2618,18 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getInPack(statusList, "orderStatus", result);
+        List<String> stringList = null;
+        List<Integer> integerList = null;
+        //List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+        if(StringUtils.isNotBlank(statusList)){
+            stringList = Arrays.asList(statusList.split(","));
+            integerList = new ArrayList<>();
+            for(String sl : stringList){
+                integerList.add(Integer.valueOf(sl));
+            }
+        }
+
+        DdlPreparedPack.getInPackList(integerList, "orderStatus", result);
         DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
         DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
@@ -2637,7 +2648,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsPullTaskDetails, result);