解决冲突

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

@@ -1811,7 +1811,8 @@ public class WmsEnumUtil {
         LOCATE_SEQ("LOCATE_SEQ", "库位序号"),
         OP_SEQ("OP_SEQ", "作业类型序号"),
         TRAN_SEQ("TRAN_SEQ", "交易类型序号"),
-        STEP_SEQ("STEP_SEQ", "步骤调用序号");
+        STEP_SEQ("STEP_SEQ", "步骤调用序号"),
+        ORDER_NO("ORDER_NO", "盘点主表序号");
 
         private String code;
         private String description;

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

@@ -40,6 +40,6 @@ public class CheckPointModel {
     /**
      *实际抽点数量【从前端输入获取】
      */
-    private Double actQty;
+    private Integer actQty;
 
 }

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

@@ -40,10 +40,6 @@ public class WmsActionModule extends BaseBean {
     @ApiParam("实现类")
     public String callClass;
 
-    @Column(name="CALL_FUN")
-    @ApiParam("调用方法")
-    public String callFun;
-
     @Column(name="AM_TYPE")
     @ApiParam(value = "组件类型", example = "0")
     public Integer amType;

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

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_TASK")
-@Api("ASN主表信息")
+@Api("作业任务表")
 public class WmsTaskInfo extends BaseBean {
 
     @Column(name="MOVE_NO")
@@ -48,6 +48,10 @@ public class WmsTaskInfo extends BaseBean {
      * 状态:1=创建,10=待处理,20=已处理
      */
     @Column(name="TASK_STATUS")
-    @ApiParam(value = "状态", example = "1")
+    @ApiParam(value = "任务状态", example = "1")
     public Integer taskStatus;
+
+    @Column(name="TRANS_TYPE_CODE")
+    @ApiParam("交易类型")
+    private String transTypeCode;
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 交易类型表
@@ -42,9 +43,13 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "序号", example = "-1")
     private Integer seq;
 
-    @Column(name = "PROG_CODE")
+    @Column(name = "AG_ID")
-    @ApiParam(value = "处理程序", example = "-1")
+    @ApiParam(value = "作业流程", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long agId;
 
+    @Transient
+    @ApiParam("中文流程名称")
+    private String agNameC;
+
 }

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

@@ -698,10 +698,13 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 订单号
-        HqlPack.getStringEqualPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
         // 业务类型
         HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result);
 
+        // 物料代码
+        HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result);
+
         getStringBuilderPack(wmsTempOrderLock, result);
 
         return result.toString();
@@ -1160,6 +1163,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result);
         // 单据编号
         HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result);
+
         getStringBuilderPack(wmsActionLog, result);
 
         return result.toString();
@@ -1182,6 +1186,8 @@ public class WmsHqlPack {
 
         getStringBuilderPack(wmsActionLogDetails, result);
 
+        HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
+
         return result.toString();
     }
 }