【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】

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

@@ -199,6 +199,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("包装编号集合")
     private List<String> packageNoList = new ArrayList<>();
 
+    @Transient
+    @ApiParam(value = "生产线名称")
+    private String workCenterName;
+
     public MesPackage() {
     }
 

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

@@ -73,6 +73,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
     @ApiParam("批次")
     private String lotNo;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
 
 
 }

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

@@ -3687,4 +3687,15 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesPackage(MesPackage mesPackage) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesPackage.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
+        DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean);
+        DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean);
+        return packBean;
+    }
+
 }