tmp

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -42,6 +43,7 @@ public class IfEdiInitialData extends BaseBean implements Serializable {
     @ApiParam("文件名称")
     private String fileName;
 
+    @Lob
     @Column(name = "FILE_URL")
     @ApiParam("文件URL")
     private String fileUrl;

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

@@ -79,7 +79,6 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@ApiParam("产品位置")
 	private String produceCategoryCode;
 
-
 	@Column(name = "QUEUE_GROUP_NO")
 	@ApiParam("分组队列编号")
 	private String queueGroupNo;
@@ -109,6 +108,10 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@ApiParam("原材料物料号")
 	private String itemPartNo;
 
+	@Column(name = "CUST_PART_NO")
+	@ApiParam("客户物料号")
+	private String custPartNo;
+
 	@Column(name = "ITEM_PART_NAME")
 	@ApiParam("原材料物料名称")
 	private String itemPartName;
@@ -121,4 +124,23 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 	@ApiParam("原材料物料用量")
 	private String itemUnit;
 
+	@Column(name = "JIT_SEQ")
+	@ApiParam("jit排序号")
+	private String jitSeq;
+
+	@Column(name = "JIT_TYPE_FLAG")
+	@ApiParam("jit类型标识")
+	private String jitTypeFlag;
+
+	@Column(name = "CUST_POINT_DATE")
+	@ApiParam("客户需求时间")
+	private String custPointDate;
+
+	@Column(name = "CUST_PLANT_CODE")
+	@ApiParam("客户工厂代码")
+	private String custPlantDate;
+
+	@Column(name = "DOCK_NO")
+	@ApiParam("道口")
+	private String dockNo;
 }

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/27 21:39
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EDI_PARSER_CONFIG")
+@Api("EDI解析配置表")
+public class MesEdiParserConfig extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7225381299744633270L;
+
+    @Column(name = "PARSER_CODE")
+    @ApiParam("解析配置代码")
+    private String parserCode;
+
+    @Column(name = "PARSER_NAME")
+    @ApiParam("解析配置名称")
+    private String parserName;
+
+    @Column(name = "PARSER_TYPE")
+    @ApiParam("解析程序集")
+    private String parserType;
+
+    @Column(name = "GETTING_CODE")
+    @ApiParam("edi抓取程序代码")
+    private String gettingCode;
+
+    @Column(name = "CURRENT_ORDER")
+    @ApiParam("当前订单号")
+    private String currentOrder;
+
+
+}

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -74,4 +75,34 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @Column(name = "VERSION")
     @ApiParam("版本号")
     private String version;
+
+    @Column(name = "JIT_SEQ")
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Lob
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    @Column(name = "SUPPLIER_NAME")
+    @ApiParam("供应商名称")
+    private String supplierName;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件url")
+    private String fileUrl;
+
 }

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

@@ -35,13 +35,17 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable {
     @ApiParam("队列编号")
     private String jisPlanNo;
 
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name = "ITEM_PART_NO")
-    @ApiParam("原材料物料号")
-    private String itemPartNo;
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户物料号")
+    private String custPartNo;
 
     @Column(name = "DOCK_NO")
     @ApiParam("道口")

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

@@ -46,4 +46,17 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     @Column(name = "PART_NAME")
     @ApiParam("产品名称")
     private String partName;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @Column(name = "FORMULA_CONTENT")
+    @ApiParam("配方内容")
+    private String formulaContent;
+
 }

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

@@ -19,15 +19,23 @@ public class EdiRequestModel implements Serializable {
 
     private String sourcePath;
 
-    private List<EdiFileModel> files;
+    private String fileName;
+
+    private String fileUrl;
+
+    private String content;
 
     private Integer ediType;
 
+    private String ediCode;
+
     private String host;
 
     private String config;
 
     private String programCode;
 
+    private String messageType;
+
     private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 }

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

@@ -0,0 +1,88 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/27 15:39
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+public class MgnBjJitPlanModel {
+
+    private String org;
+
+    private String userInfo;
+
+    private List<MesScatterBomCfg> scatterBomCfgOptions;
+
+    private List<MesScatterBomCfg> scatterBomCfgBaseModules;
+
+    private List<String> messageCustPartNos;
+
+    private List<String> messageCodeRules;
+
+    private List<Part> flPnParts;
+
+    private String flPnRecipe;
+
+    private List<Part> frPnParts;
+
+    private String frPnRecipe;
+
+    private List<Part> rlPnParts;
+
+    private String rlPnRecipe;
+
+    private List<Part> rrPnParts;
+
+    private String rrPnRecipe;
+
+    private Map<String, List<Part>> groupPartsMap = new HashMap<>();
+
+    private Map<String, List<Part>> recipePartsMap = new HashMap<>();
+
+    public void setFlPnParts(List<Part> flPnParts) {
+        this.groupPartsMap.put("FL", flPnParts);
+        this.flPnRecipe = getGroupRecipe(flPnParts);
+        this.flPnParts = flPnParts;
+    }
+
+    public void setFrPnParts(List<Part> frPnParts) {
+        this.groupPartsMap.put("FR", frPnParts);
+        this.frPnRecipe = getGroupRecipe(frPnParts);
+        this.frPnParts = frPnParts;
+    }
+
+    public void setRlPnParts(List<Part> rlPnParts) {
+        this.groupPartsMap.put("RL", rlPnParts);
+        this.rlPnRecipe = getGroupRecipe(rlPnParts);
+        this.rlPnParts = rlPnParts;
+    }
+
+    public void setRrPnParts(List<Part> rrPnParts) {
+        this.groupPartsMap.put("RR", rrPnParts);
+        this.rrPnRecipe = getGroupRecipe(rrPnParts);
+        this.rrPnParts = rrPnParts;
+    }
+
+    public MgnBjJitPlanModel(String org, String userInfo) {
+        this.org = org;
+        this.userInfo = userInfo;
+    }
+
+    private String getGroupRecipe(List<Part> groupParts) {
+        List<String> groupPartsRecipe = groupParts.stream().filter(d -> StringUtils.isNotBlank(d.getRecipeSeq()))
+                .sorted(Comparator.comparing(Part::getRecipeSeq))
+                .map(Part::getRecipeItem)
+                .collect(Collectors.toList());
+        return String.join("", groupPartsRecipe);
+    }
+}

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

@@ -29,16 +29,19 @@ public class Part implements Serializable {
     private boolean isBaseModule;
 
     @ApiParam("前左数量")
-    private String flQty = "0";
+    private String flQty;
 
     @ApiParam("前右数量")
-    private String frQty = "0";
+    private String frQty;
 
     @ApiParam("后左数量")
-    private String rlQty = "0";
+    private String rlQty;
 
     @ApiParam("后右数量")
-    private String rrQty = "0";
+    private String rrQty;
+
+    @ApiParam("产品位置")
+    private String produceCtgyCode;
 
     @ApiParam("配方")
     private String recipeItem;
@@ -46,4 +49,8 @@ public class Part implements Serializable {
     @ApiParam("配方顺序")
     private String recipeSeq;
 
+
+    @ApiParam("Mes物料号")
+    private String partNo;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEdiParserConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesEdiParserConfigRepository extends BaseRepository<MesEdiParserConfig, Long> {
+}