Prechádzať zdrojové kódy

工序作业及输出加字段

DLC 1 rok pred
rodič
commit
1d296400b5

+ 13 - 3
cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationDo.java

@@ -90,7 +90,7 @@ public class ApsProcessOperationDo extends BaseDo {
     @TableField("ONCEPROCESSVAL")
     private BigDecimal onceprocessval;
     /**
-     * 单次加工时长
+     * 单卷作业时长(分钟)
      */
     @TableField("ONCEPROCESSMIN")
     private BigDecimal onceprocessmin;
@@ -300,7 +300,7 @@ public class ApsProcessOperationDo extends BaseDo {
     @TableField("ACTUALIMPUTROLL")
     private Integer actualimputroll;
     /**
-     * 输入不合格卷数
+     * 输入已取消卷数
      */
     @TableField("INPUTUNQUALIFIEDROLL")
     private Integer inputunqualifiedroll;
@@ -360,7 +360,7 @@ public class ApsProcessOperationDo extends BaseDo {
     @TableField("BACHMATERIALPROCESS")
     private String bachmaterialprocess;
     /**
-     * 计划作业时长
+     * 计划作业时长(分钟)
      */
     @TableField("PROCESSTOTALTIME")
     private BigDecimal processtotaltime;
@@ -456,6 +456,16 @@ public class ApsProcessOperationDo extends BaseDo {
      */
     @TableField("workspeed")
     private BigDecimal workspeed;
+    /**
+     * 剩余待报工卷数
+     */
+    @TableField("LEAVEWAITJOBROLL")
+    private Integer leavewaitjobroll;
+    /**
+     * 剩余待开工卷数
+     */
+    @TableField("LEAVEWAITWORKROLL")
+    private Integer leavewaitworkroll;
 
 
 }

+ 53 - 8
cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationOutMaterDo.java

@@ -264,24 +264,69 @@ public class ApsProcessOperationOutMaterDo extends BaseDo implements Serializabl
     private Integer goodrollnum;
 
     /**
-     * 横切分卷数
+     * 计划备料卷数
      */
-    private Integer crosscutnum;
+    private Integer planstockrollnum;
 
     /**
-     * 纵切分卷数
+     * 计划成品卷数
      */
-    private Integer ripcutnum;
+    private Integer planprodrollnum;
 
     /**
-     * 计划备料卷数
+     * 计划流转卷数
      */
-    private Integer planstockrollnum;
+    private Integer planmoverollnum;
 
     /**
-     * 计划成品卷数
+     * 成品已输出卷数
      */
-    private Integer planprodrollnum;
+    private Integer prodoutroll;
+
+    /**
+     * 流转已输出卷数
+     */
+    private Integer moveoutroll;
+
+    /**
+     * 备料已输出卷数
+     */
+    private Integer stockoutroll;
+
+    /**
+     * 输出已取消卷数
+     */
+    private Integer outcancelroll;
+
+    /**
+     * 成品已取消卷数
+     */
+    private Integer prodcancelroll;
+
+    /**
+     * 流转已取消卷数
+     */
+    private Integer movecancelroll;
+
+    /**
+     * 备料已取消卷数
+     */
+    private Integer stockcancelroll;
+
+    /**
+     * 成品剩余需输出卷数
+     */
+    private Integer prodleaveoutroll;
+
+    /**
+     * 流转剩余需输出卷数
+     */
+    private Integer moveleaveoutroll;
+
+    /**
+     * 备料剩余需输出卷数
+     */
+    private Integer stockleaveoutroll;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;