diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 241a767..1e02137 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -256,14 +256,14 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_STATUS { - NORMAL(1, "正常", "正常_NORMAL"), - FREEZE(2, "冻结", "冻结_FREEZE"), +// NORMAL(1, "fa fa-success cell-fa fa-check", "正常"), +// FREEZE(2, "冻结", "冻结_FREEZE"), // ABERRANT(3, "异常", "异常_ABERRANT"), // RESIGNATION(4, "离职", "离职_RESIGNATION"), // EXPIRE(5, "服务到期", "服务到期_EXPIRE"), - LOCKING(6, "锁定", "fa cell-fa fa-lock"), - ENABLE(7, "启用", "fa fa-success cell-fa fa-check"), - DISABLE(8, "禁止", "fa fa-disabled cell-fa fa-times-circle"); + LOCKING(3, "fa cell-fa fa-lock", "锁定"), + ENABLE(1, "fa fa-success cell-fa fa-check", "启用"), + DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁止"); private int value; private String code; @@ -419,7 +419,7 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum METHOD_LEVEL { - MODULE(1, "模块"), METHOD(2, "功能"), BUTTON(3, "按钮"); + PLUGIN(1, "插件"),MODULE(2, "模块"), METHOD(3, "功能"), BUTTON(4, "按钮"); private int value; private String description; 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 e6e4f3f..7b8dcf8 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 @@ -1588,7 +1588,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PO_SN_STATUS { - fOUND(10, "创建"), + FOUND(10, "创建"), PRINTED(20, "已打印"), RECEIPTED(30, "已收货"); @@ -1695,4 +1695,40 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 条码类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_TYPE { + ONE_DIMENSIONAL_CODE(10, "1D"), + QR_CODE(20, "2D"), + ALL(30, "ALL"); + + private int value; + private String description; + + SN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index a108879..fa95759 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -106,6 +106,32 @@ public class HqlPack { } } + + /** + * 封装日期 + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param result 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, StringBuffer result,boolean isShowTime) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if(date != null && date.trim().length() > 0) { + date = getSafeParam(date); + }else { + date = sdf.format(new Date()); + } + if(!isShowTime) { + date = date.substring(0,10); + result.append(" and '"+date+"' between substring(model." + startColumnName + ",1,10) and substring(model." + endColumnName + ",1,10)"); + return; + }else if(date.trim().length()<=11){ + date+= " 00:00:00"; + } + result.append(" and '"+date+"' between model." + startColumnName + " and model." + endColumnName); + } + /** * 封装String对象成order by排序 * @param columnName 列名 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java new file mode 100644 index 0000000..c26b6a6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 可选项模型 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-30 10:50 + * @Modify: + **/ +@Data +public class OptionModel { + + private String code; + + private String name; + + private Boolean value; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 754a668..55af110 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -68,7 +68,7 @@ public class SysMenu extends BaseBean { @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") private String menuUrl; - + @Column(name="MENU_CSS") @ApiParam(value ="资源css" , access ="资源css") private String menuCss; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 0b0d0aa..1a8098c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="SYS_REF_USER_MESSAGE") -@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器") +@Api(value="关系-用户消息",description = "关系-用户消息") public class SysRefUserMessage extends BaseBean { @Column(name="MESSAGE_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 9ab72fc..4641688 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -67,7 +67,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="手机号" , access ="手机号") private String userPhone; - @Column(name="USER_STATUS_ID") + @Column(name="USER_STATUS") @ApiParam(value ="用户状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") private Integer userStatus; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 603a79a..1b0d73a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -143,6 +143,7 @@ public class CoreHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(menu.getMenuType(),"menuType",result); HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); HqlPack.getStringLikerPack(menu.getName(),"name",result); HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); @@ -313,6 +314,7 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result); HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result); + HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); // And Like % % HqlPack.getStringLikerPack(user.getUserName(),"userName",result); HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); @@ -339,6 +341,22 @@ public class CoreHqlPack { } /** + * 查询字典值是否重复 + * @param dictionary + * @return + */ + public static String packHqlSysDictionaryValue(SysDictionary dictionary){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); + // not + HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + + return result.toString(); + } + + /** * 用户信息 复杂查询拼接 * @param userInfo * @return diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index ccc7391..905b851 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -105,4 +105,8 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name="VENDOR_LOT_NO") @ApiParam("供应商批次") public String vendorLotNo; + + @Column(name="REC_QTY") + @ApiParam(value = "已收数量", example = "0") + public Double recQty; } 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 779e1b5..da46d9e 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 @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import java.util.List; import java.util.Map; +import java.util.Set; /** * @Description : PDA传输到后台的实体bean对象 @@ -40,7 +41,7 @@ public class WmsActionResponseBean { public List informations; @ApiParam("可选项") - public Map options; + public Map options; @ApiParam("选中的明细数据") public List> details; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 942e6a8..2ab3567 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -50,4 +50,8 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public transient String amDesc; + + @Column(name="AM_TYPE") + @ApiParam(value = "组件类型", example = "0") + public Integer amType; } 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 d462e18..1a84d4c 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 @@ -70,4 +70,8 @@ public class WmsMoveSn extends BaseBean { @Column(name="PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; + + @Column(name="QTY") + @ApiParam(value = "已收数量", example = "0") + public Double qty; } 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 f492d9d..68219ca 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 @@ -25,6 +25,12 @@ public class WmsOperationBean extends BaseBean { @ApiParam("可选项的值") public List options; + @ApiParam("设备编号") + public String fixNo; + + @ApiParam("作业记录编号") + public String alId; + /** * 触发源:10=扫描枪, * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 48b189c..62774b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -75,4 +75,8 @@ public class WmsPoSn extends BaseBean { @Column(name="GROUP_NO") @ApiParam("组条码") public String groupNo; + + @Column(name="REC_QTY") + @ApiParam(value = "已收数量", example = "0") + public Double recQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index c56c29c..246524b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -45,6 +45,6 @@ public class WmsTransType extends BaseBean { @Column(name = "PROG_CODE") @ApiParam(value = "处理程序", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long progCode; + private Long agId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java index 04b5b62..fd86ecd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Date; /** * @Description : 抽点比例表 @@ -11,4 +15,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; * @Modify: **/ public interface WmsIbCheckPlanRepository extends BaseRepository { + + @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and icp.organizeCode=:organizeCode and icp.startDate<=:date and icp.endDate>=:date") + WmsIbCheckPlan findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("organizeCode") String organizeCode, @Param("date") String date); + } 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 8e9c428..f784167 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 @@ -240,9 +240,9 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result); + HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); getStringBuilderPack(wmsTransType, result); @@ -1000,8 +1000,10 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); getStringBuilderPack(wmsActionStepCall, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); return result.toString(); @@ -1092,6 +1094,21 @@ public class WmsHqlPack { } /** + * 作业流程明细分页查询 + * @return + */ + public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){ + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); + + getStringBuilderPack(wmsActionGroupDetails, result); + + return result.toString(); + } + + /** * 作业记录参数信息 查询条件封装 * * @param wmsActionLogData @@ -1116,6 +1133,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); + HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); getStringBuilderPack(wmsActionStepCallParam, result); @@ -1155,8 +1173,13 @@ public class WmsHqlPack { //作业流程id（对应作业记录明细里自增的id） HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); + getStringBuilderPack(wmsActionLogDetails, result); - return result.toString(); + return result.toString(); } }