Merge remote-tracking branch 'origin/test' into test

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;
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUserPrinterInfo.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.wms.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.*;
+
+/**
+ * @Description 用户打印机绑定信息
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/12/17 15:38
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name="WMS_USER_PRINTER_INFO")
+@Api("用户打印机绑定信息")
+public class WmsUserPrinterInfo extends BaseBean{
+
+    @Column(name="PRINTER_NO")
+    @ApiParam("打印机编号")
+    private String printerNo;
+
+    @Column(name="USER_NO")
+    @ApiParam("用户编码")
+    private String userNo;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+/**
+ * @Description : 自动生成领料看板model
+ * @Author : shun.cui
+ * @CreateDate : 2020/12/17 10:34
+ * @Modify :
+ **/
+@Data
+@Api("自动生成领料看板")
+public class AutoPickingModel {
+    @ApiParam("工厂名")
+    private String organizeCode;
+    @ApiParam("计划日期")
+    private String planDate;
+    @ApiParam("sap单号")
+    private String erpSrcNo;
+    @ApiParam("状态")
+    private int orderStatus;
+    @ApiParam("父零件号")
+    private String partNo;
+    @ApiParam("简称")
+    private String partNameRdd;
+    @ApiParam("完成数量")
+    private Double printQty;
+    @ApiParam("总数量")
+    private Double qty;
+    @ApiParam("操作时间")
+    private String modifyDateTime;
+    @ApiParam("操作人")
+    private String modifyUser;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 最低库存/最高库存 预警看板 Model
+ * @Author : shun.cui
+ * @CreateDate : 2020/12/17 10:55
+ * @Modify :
+ **/
+@Data
+@Api("最低库存/最高库存预警看板")
+public class MinAndMaxStockModel {
+    @ApiParam("工厂名")
+    private String organizeCode;
+    @ApiParam("存储区")
+    private String zoneNo;
+    @ApiParam("库位")
+    private String locateNo;
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("简称")
+    private String partNameAdd;
+    @ApiParam("数量")
+    private Double qty;
+    @ApiParam("最低库存")
+    private Double min;
+    @ApiParam("最高库存")
+    private Double max;
+    @ApiParam("件号")
+    private String partTypeDesc;
+    @ApiParam("包装规格")
+    private Double snp;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUserPrinterInfoRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsUserPrinterInfo;
+
+/**
+ * @Description 用户打印机绑定信息DAO层
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/12/17 15:42
+ * @Modify
+ */
+public interface WmsUserPrinterInfoRepository extends BaseRepository<WmsUserPrinterInfo, Long> {
+}