merge master 防止冲突更多

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

@@ -706,7 +706,7 @@ public class MesEnumUtil {
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
         EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
 
         private String value;
         private String description;

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

@@ -111,7 +111,7 @@ public class MesPackage extends BaseBean implements Serializable {
     private String ctNo;
 
     @Column(name = "SAMPLE_TYPE")
-    @ApiParam("样本类型")
+    @ApiParam("条码类型")
     private String sampleType;
 
     @Transient

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

@@ -100,21 +100,30 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     @ApiParam(value = "动作类型")
     private Integer actionType;
 
+    @Transient
     @ApiParam(value = "是否绑定关键件名称")
     private String isBindKeyName;
 
+    @Transient
     @ApiParam(value = "动作类型名称")
     private String actionTypeName;
 
+    @Transient
     @ApiParam("产品条码零件名称")
     private String partName;
 
+    @Transient
     @ApiParam("原材料零件名称")
     private String itemPartName;
 
+    @Transient
     @ApiParam("生产队列号")
     private String orderNo;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
 
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;

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

@@ -10,8 +10,10 @@ import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
 import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.List;
 /**
  * @Description:
  * @Reference: Mes 条件封装
@@ -2003,11 +2005,14 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
+    public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode, List<String> serialNumbers) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
         if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
             DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
         }
+        if (!CollectionUtils.isEmpty(serialNumbers)) {
+            DdlPreparedPack.getInPackList(serialNumbers, "serialNumber", packBean);
+        }
         if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
             DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
         }

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

@@ -116,7 +116,7 @@ public class MesPcnHqlPack {
      * 获取原材料扫描信息的对应工序BOM
      *
      * @param stationBom
-     * @param rawPartSn
+     * @param rawPartNo
      * @return
      */
     public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {