From 4aaa9bc03a2cf1f0ded9a2b92449f2f7ae5f00f6 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 22 Mar 2019 13:42:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E5=AE=B6=202.=E5=BC=80=E5=8F=91=E6=9D=A1=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=89=93=E5=8D=B0=EF=BC=8C?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9B=9E=E6=89=A7=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java | 82 ++++++++++++++++++++++ .../wms/repository/WmsSnPrintRcdRepository.java | 16 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 36 ++++++++-- 4 files changed, 129 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5baff68..2d479ab 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1589,8 +1589,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRINT_ORDER_TYPE { PO(10, "PO"), - MOVEMENT(20, "MOVEMENT"), - ASN(30, "ASN"); + ASN(30, "ASN"), + MOVEMENT(20, "MOVEMENT"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java new file mode 100644 index 0000000..d2fa686 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -0,0 +1,82 @@ +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 org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; + +/** + * @Description : 条码补打印记录表 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-21 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_SN_PRINT_RCD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "条码补打印记录表", description = "条码补打印记录表") +public class WmsSnPrintRcd extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + private String locateNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "0") + private Double qty; + + @Column(name = "PDATE") + @ApiParam(value = "打印时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date pdate; + + @ApiParam(value = "仓库名称") + @Transient + public String whNameRdd; + + @ApiParam(value = "存储区名称") + @Transient + public String zoneNameRdd; + + @ApiParam(value = "库位名称") + @Transient + public String locateNameRdd; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java new file mode 100644 index 0000000..d4a0c0a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrintRcd; +import org.springframework.stereotype.Repository; + +/** +* @Description :条码打印记录Repository的方法接口 +* @Reference : +* @Author : siliter +* @CreateDate : 2019-03-21 10:19 +* @Modify: +**/ +@Repository +public interface WmsSnPrintRcdRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index dac5fb6..e43b5db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1248,6 +1248,10 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); + // 设备编号 + HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); + // 流程状态 + HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); getStringBuilderPack(wmsActionLog, result); @@ -1320,11 +1324,11 @@ public class WmsHqlPack { public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); @@ -1334,6 +1338,23 @@ public class WmsHqlPack { } /** + * 根据条件查询条码条码信息 + * + * @param wmsSnPrintRcd + * @return + */ + public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); + getStringBuilderPack(wmsSnPrintRcd, result); + return result.toString(); + } + + /** * 根据条件模糊查询库存条码信息 * * @param wmsStockSn @@ -1419,10 +1440,11 @@ public class WmsHqlPack { * @param vals * @return */ - public static String packHqlAndIn(BaseBean bean, String columnName, List vals) { + public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPackString(data, columnName, result); + HqlPack.getInPackString(data,columnName,result); + HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); }