代码回滚

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.validator.ImportGroup;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -49,5 +50,6 @@ public class DayShift extends BaseAPS {
 
     @Column(name="COLOR")
     @ApiParam(value ="颜色")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.COLOR_PICKER)
     private String color;
 }

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

@@ -1037,7 +1037,8 @@ public class ApsEnumUtil {
         OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
         LIST("LIST", "对象集合，不可编辑。"),
         MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"),
-        QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项");
+        QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"),
+        COLOR_PICKER("COLOR_PICKER", "颜色选择框");
 
         private String value;
         private String description;

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

@@ -5,9 +5,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Transient;
-
 /**
  * @Description: 打印条码工步， 打印信息模板
  * @Reference:
@@ -159,4 +156,6 @@ public class StepPrintSnModel extends MesProduceSn {
     private String qcCode;
     @ApiParam("打印机名称")
     private String printerName;
+    @ApiParam("是否DB件")
+    private String isDb;
 }