diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index 2be5bd4..8006162 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -48,6 +48,6 @@ public class WmsActionModuleParam extends BaseBean { public String paramValueList; @Column(name = "PARAM_TYPE") - @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串】", example = "0") + @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0") public Integer paramType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index b5e519a..d051693 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -26,6 +26,9 @@ import java.util.Map; @Api("返回前端数据实体") public class WmsActionResponseBean { + @ApiParam("回显BARCODE值") + public Map barCode; + @ApiParam("进度") public String percent; @@ -59,7 +62,7 @@ public class WmsActionResponseBean { * 就把detailsData的内容以List的格式显示到 列表提示区域 */ @ApiParam(value = "是否需要选择单号") - public Boolean toSelected; + public Boolean toSelected = false; /** * 与 toSelected 属性配合使用， @@ -73,6 +76,15 @@ public class WmsActionResponseBean { this.message = message; } + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus, Map barCode) { + this.percent = percent; + this.message = message; + this.informations = informations; + this.details = details; + this.codeStatus = codeStatus; + this.barCode = barCode; + } + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus) { this.percent = percent; this.message = message; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 698347f..dc89b72 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -36,9 +36,12 @@ public class WmsLocate extends BaseBean { @ApiParam(value ="库位名称") private String locateName; + /** + * 1=收货库,10=基础库,20=机动库,30=组合库,40=线边库,50=NC库 + */ @Column(name="LOCATE_TYPE") @ApiParam(value ="库位类型") - private String locateType; + private Integer locateType; @Column(name="WH_NO") @ApiParam(value ="仓库代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 1c0dfab..7dea2dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -64,17 +64,29 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("单位") public String unit; - @Column(name="WH_NO") + @Column(name="SRC_WH_NO") @ApiParam("仓库代码") - public String whNo; + public String srcWhNo; - @Column(name="ZONE_NO") + @Column(name="SRC_ZONE_NO") @ApiParam("存储区代码") - public String zoneNo; + public String srcZoneNo; - @Column(name="LOCATE_NO") - @ApiParam("库位代码") - public String locateNo; + @Column(name="SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name="DEST_WH_NO") + @ApiParam("目标库位代码") + public String destWhNo; + + @Column(name="DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name="DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; /** * 状态:0=创建,5=待处理,10=已处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 1a84d4c..fe8c915 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -74,4 +74,12 @@ public class WmsMoveSn extends BaseBean { @Column(name="QTY") @ApiParam(value = "已收数量", example = "0") public Double qty; + + @Column(name="SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name="DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 8cdf9ea..1fbbbf4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -17,13 +18,13 @@ import java.util.List; **/ @Data @Api("接受前端数据实体") -public class WmsOperationBean extends BaseBean { +public class WmsOperationBean extends BaseBean { @ApiParam("扫描内容") public String barCode; @ApiParam("可选项的值") - public List options; + public List options; @ApiParam("设备编号") public String fixNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java index e8aca84..0fbf62b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java @@ -24,4 +24,15 @@ public interface WmsMoveDetailsRepository extends BaseRepository :status") + int getCountNotInStatus(@Param("organizeCode")String organizeCode, @Param("isValid")int isValid, @Param("isDeleted")int isDeleted,@Param("status")int status); + } 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 a59084a..860815c 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 @@ -181,15 +181,15 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); - if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) { + getStringBuilderPack(wmsIbCheckPlan, result); + + if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } - if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) { + if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } - getStringBuilderPack(wmsIbCheckPlan, result); - return result.toString(); } @@ -224,7 +224,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); - HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result); + HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result); @@ -853,9 +853,12 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getWhNo(),"whNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getZoneNo(),"zoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getLocateNo(),"locateNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result); HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); @@ -1063,6 +1066,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); return result.toString(); @@ -1159,12 +1163,10 @@ public class WmsHqlPack { public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) { StringBuffer result = new StringBuffer(); - if (StringUtils.isNotBlank(wmsActionLog.getStartTimeStart()) && - StringUtils.isNotBlank(wmsActionLog.getStartTimeEnd())) { + if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), "startTime", result, true); - } else if (StringUtils.isNotBlank(wmsActionLog.getEndTimeStart()) && - StringUtils.isNotBlank(wmsActionLog.getEndTimeEnd())) { + } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), "endTime", result, true); }