Finish Task #2184 Cost:8h

2184 06 1.2.3.7.1物流路线检查

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -91,9 +93,10 @@ public class WmsAutoForkCallBackDetails extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String robotCode;
 
-    //10=新建,20=已处理,30=处理出错
+    @Column(name = "STATUS", nullable = false, columnDefinition = "default 10")
-    @Column(name = "STATUS", nullable = false)
     @ApiParam("处理标准")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
     public Integer status;
 
     @Column(name = "REMARK", nullable = false)

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

@@ -13,8 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.List;
 
 /**
  * @Description :物流线路规则表
@@ -123,6 +121,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "目的单据条码状态")
     private Integer destMoveSnStatus;
 
+    @Column(name = "FILTER_SCRIPT_NO", length = 50)
+    @ApiParam(value = "过滤条件")
+    private String filterScriptNo;
+
     public WmsRoutingRule(){}
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 自动过滤物流路线
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-07-01
+ * @Modify:
+ **/
+@Data
+@Api("自动过滤物流路线")
+public class WmsAutoFilterRoutingRuleModel {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("料架车")
+    private String parentSpec;
+}