pojo

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesBadCellDetail.java

@@ -93,14 +93,26 @@ public class MesBadCellDetail extends BaseBean implements Serializable {
     @ApiParam("维修状态")
     private Integer repairStatus = 20;
 
-    @Column(name = "IS_FREEZE")
+    @Column(name = "IS_UNFREEZE")
     @ApiParam("是否解冻")
-    private Integer isFreeze = 20;
+    private Integer isUnfreeze = 20;
 
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "MANAGE_CODE")
+    @ApiParam("管理码")
+    private String manageCode;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "THIRD_PARTY_PID")
+    @ApiParam("关联ID")
+    private String thirdPartyPid;
+
     @Column(name = "APPROVAL_STATUS")
     @ApiParam("审批状态: 未审批=30, 通过=10, 驳回=20")
     @ColumnDefault("30")

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesManualReportTravel.java

@@ -0,0 +1,92 @@
+package cn.estsh.i3plus.ext.mes.pcn.pojo.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 文件描述
+ *
+ * @author xiangming.liao
+ * @date 2021年08月21日 6:34
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_MANUAL_REPORT_TRAVEL")
+@Api("MES_手动报工履历信息")
+public class MesManualReportTravel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2979783006130877088L;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("生产线名称")
+    private String workCenterName;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("作业日期")
+    private String workTime;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY")
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @Column(name = "COMPLETE_QTY")
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @Column(name = "REPORT_QTY")
+    @ApiParam("手动报工数量")
+    private Double reportQty;
+
+    @Column(name = "START_TIME")
+    @ApiParam("计划开始时间")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("计划结束时间")
+    private String endTime;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
+
+}

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesPartExt.java

@@ -189,4 +189,9 @@ public class MesPartExt extends MesPart implements Serializable {
     @ApiParam("补件是否报工")
     private Integer isRepairWorkReport = 10;
 
+    @Column(name = "IS_MANUAL_REPORT")
+    @ColumnDefault("20")
+    @ApiParam("是否可手动报工")
+    private Integer isManualReport = 20;
+
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProduceSnExt.java

@@ -100,4 +100,8 @@ public class MesProduceSnExt extends MesProduceSn implements Serializable {
     @ColumnDefault("2")
     @ApiParam(value = "系统同步标志")
     public Integer systemSyncStatusExt = 2;
+
+    @Transient
+    @ApiParam(value = "管理码")
+    public String manageCode;
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesRepairRecordExt.java

@@ -115,8 +115,20 @@ public class MesRepairRecordExt extends MesRepairRecord implements Serializable
     @ApiParam("不良类型描述")
     private String defectTypeName;
 
-    @Column(name = "IS_FREEZE")
+    @Column(name = "IS_UNFREEZE")
     @ApiParam("是否解冻")
-    private Integer isFreeze = 20;
+    private Integer isUnfreeze = 20;
+
+    @Column(name = "MANAGE_CODE")
+    @ApiParam("管理码")
+    private String manageCode;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "THIRD_PARTY_PID")
+    @ApiParam("关联ID")
+    private String thirdPartyPid;
 
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesOrderJobModel.java

@@ -102,10 +102,13 @@ public class MesOrderJobModel implements Serializable {
     @ApiParam("单据日期截止")
     private String orderDateEnd;
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
     public MesOrderJobModel() {
     }
 
-    public MesOrderJobModel(Long id, Integer taskType, Integer orderType, String orderNo, String workCenterCode, String shiftCode, String workOrderNo, Integer orderStatus, String orderDate, String generateTime, String complateTime, String partNo, String partNameRdd, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesOrderJobModel(Long id, Integer taskType, Integer orderType, String orderNo, String workCenterCode, String shiftCode, String workOrderNo, Integer orderStatus, String orderDate, String generateTime, String complateTime, String partNo, String partNameRdd, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
         this.id = id;
         this.taskType = taskType;
         this.orderType = orderType;
@@ -126,6 +129,7 @@ public class MesOrderJobModel implements Serializable {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.serialNumber = serialNumber;
     }
 
     public MesOrderJobModel(Long id, Integer taskType, Integer orderType, String orderNo, String workCenterCode, String shiftCode, String workOrderNo, Integer orderStatus, String orderDate, String generateTime, String complateTime, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/repository/MesManualReportTravelRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.pcn.pojo.repository;
+
+import cn.estsh.i3plus.ext.mes.pcn.pojo.bean.MesManualReportTravel;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author xinwang.yi
+ * @version 1.0
+ * @date 2023/10/25 9:17
+ **/
+@Repository
+public interface MesManualReportTravelRepository extends BaseRepository<MesManualReportTravel, Long> {
+
+}