交易处理组件公共方法提取

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

@@ -58,11 +58,11 @@ public class WmsASNMasterDetails extends BaseBean {
 
     @Column(name = "ZDATE")
     @ApiParam("计划交货日期")
-    public String zDate;
+    public String planDate;
 
     @Column(name = "ZTIME")
     @ApiParam("计划交货时间")
-    public String zTime;
+    public String planTime;
 
     /**
      * 状态:N=正常,C=行取消,R=已收货

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

@@ -62,4 +62,7 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "盘点明细集")
     public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
 
+    @Column(name = "IS_TASK")
+    @ApiParam(value = "是否生产任务", example = "1")
+    public Integer isTask;
 }

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

@@ -57,7 +57,7 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "TRANS_TYPE_CODE")
     @ApiParam("交易类型")
-    private String transTypeCode;
+    public String transTypeCode;
 
     @Column(name = "PRE_USE_TIME")
     @ApiParam(value = "预计作业时间(分钟)", example = "1")

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

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_TASK_SRC")
-@Api("作业任务表")
+@Api("作业任务数据来源表")
 public class WmsTaskSrc extends BaseBean {
 
     @Column(name = "OP_TYPE_CODE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java

@@ -12,6 +12,5 @@ import org.springframework.stereotype.Repository;
  * @CreateDate : 2019-03-06 14:41
  * @Modify:
  **/
-@Repository
 public interface WmsTaskSrcRepository extends BaseRepository<WmsTaskSrc, Long> {
 }

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

@@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -58,8 +57,8 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result);
 
         getStringBuilderPack(wmsPOMasterDetails, result);
 
@@ -585,8 +584,8 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result);
-        HqlPack.getStringEqualPack(wmsASNMasterDetails.getZDate(), "zDate", result);
-        HqlPack.getStringEqualPack(wmsASNMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result);
+        HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result);
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result);
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result);