Merge remote-tracking branch 'remotes/origin/test'

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

@@ -301,16 +301,9 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "组织名称")
     private String organizeNameRdd;
 
-    /**
-     * 1 = 是，2 = 否
-     */
-    @Column(name = "IS_RESOLVE")
-    @ApiParam(value = "是否驳回", example = "2")
-    private Integer isResolve;
-
-    @Column(name = "RESOLVE_OPINION")
+    @Column(name = "REJECT_OPINION")
     @ApiParam(value = "驳回意见")
-    private String resolveOpinion;
+    private String rejectOpinion;
 
     @Transient
     @ApiParam(value = "安灯状态集合")

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

@@ -256,6 +256,14 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "重要等级名称")
     private String importanceNameRdd;
 
+    @Column(name = "ORGANIZE_NAME_RDD")
+    @ApiParam(value = "组织名称")
+    private String organizeNameRdd;
+
+    @Column(name = "REJECT_OPINION")
+    @ApiParam(value = "驳回意见")
+    private String rejectOpinion;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -570,7 +570,7 @@ public class AndonEnumUtil {
         CANCEL_ACTION("40", "撤销动作"),
         COMMIT_ACTION("50","提交动作"),
         PASS_ACTION("60","审批动作"),
-        SHIFG_CALL_ACTION("70", "转呼动作");
+        REJECT_ACTION("70", "驳回动作");
 
         private String value;
         private String description;

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

@@ -65,4 +65,13 @@ public class SessionUser implements Serializable {
         this.languageCode = languageCode;
         this.userType = userTypeId;
     }
+
+    /**
+     * 不建议使用， 推荐使用 AuthUtil.getDeviceId(); 方法
+     * @return
+     */
+    @Deprecated
+    public String getDeviceId() {
+        return deviceId;
+    }
 }

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

@@ -658,6 +658,7 @@ public class WmsHqlPack {
 
         getStringBuilderPack(wmsASNMasterDetails, result);
 
+        DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"snOneBarCode"}, result);
         return result;
     }