注塑上料

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java

@@ -72,6 +72,10 @@ public class MesCellFeed extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
+
     @Transient
     @ApiParam(value = "原料类型名称")
     private String rawTypeName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java

@@ -71,6 +71,10 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Column(name = "RACK_NO")
+    @ApiParam("料箱编号")
+    private String rackNo;
+
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java

@@ -44,10 +44,6 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @ApiParam("是否默认")
     private Integer isDefault;
 
-    @Column(name = "PART_SN")
-    @ApiParam("料箱条码")
-    private String partSn;
-
     @Column(name = "RACK_NO")
     @ApiParam("料箱编号")
     private String rackNo;

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc TJ注塑上料展示组件顶部数据集合model
+ */
+@Data
+public class InjectionFeedingDetailModel {
+
+    @ApiParam("是否选中：1=是，2=否")
+    private Integer isCheck = 2;
+
+    @ApiParam("机台编号")
+    private String workCenterCode;
+
+    @ApiParam("机台名称")
+    private String workCenterName;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @ApiParam("工单状态名称")
+    private String workOrderStatusName;
+
+    @ApiParam("工单计划数量")
+    private String qty;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("错误信息")
+    private String error;
+
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @date 2020/4/9 18:00
+ * @desc TJ注塑上料展示组件顶部数据model
+ */
+@Data
+public class InjectionFeedingModel {
+
+    @ApiParam("料箱")
+    private String rackNo;
+
+    @ApiParam("原材料物料号")
+    private String partNo;
+
+    @ApiParam("是否锁定：1=是，2=否")
+    private Integer lockFlag;
+
+    @ApiParam("机台工单集合")
+    private List<InjectionFeedingDetailModel> detailModelList = new ArrayList<>();
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3174,6 +3174,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
+        }
         if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
             DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
         }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -668,4 +668,25 @@ public class MesPcnHqlPack {
 
         return packBean;
     }
+
+    /**
+     * 产品工作中心配置
+     *
+     * @param prodWorkCenter
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode);
+        if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodWorkCenter.getRackNo())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getRackNo(), "rackNo", packBean);
+        }
+        if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        return packBean;
+    }
 }