diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java new file mode 100644 index 0000000..6c0fae6 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.base.bean; + +/** + * @Description : 基础fallback类，用于处理熔断 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-11-22 18:47 + * @Modify: + **/ +public class BaseFallBackBean { + + public BaseResultBean makeBaseFallBack(){ + return makeBaseFallBack("服务暂停"); + } + + public BaseResultBean makeBaseFallBack(String msg){ + return BaseResultBean.buildBaseResultBean(false,msg); + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index ad47fee..5b3a15c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -95,7 +95,6 @@ public class BaseResultBean { return totalCount; } - public static BaseResultBean buildBaseResultBean(boolean success,String msg){ BaseResultBean rs = new BaseResultBean(); rs.success = success; 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 7714b9d..241a767 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 @@ -20,9 +20,11 @@ public class CommonEnumUtil { CORE(2, "i3core", "i3业务平台"), WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), + CONSOLE(95,"impp-console","服务监控台"), + GATEWAY(96,"impp-gateway","服务网关"), CLOUD(97,"i3cloud","微服务"), SURFACE(98,"i3surface","对外服务"), - CENTER(99,"icloud-server","云服务中心"); + CENTER(99,"icloud-server","注册中心"); public int value; public String code; 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 be4e962..e6e4f3f 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 @@ -49,9 +49,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - NORMAL(10, "N", "正常"), - ANCEL(20, "C", "行取消"), - RECEIPTED(30, "R", "已收货"); + NORMAL(1, "N", "正常"), + ANCEL(10, "C", "行取消"), + RECEIPTED(20, "R", "已收货"); private int value; private String code; @@ -1162,7 +1162,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ITEM_STATUS { - CREATE(1, "创建"), FINISH(10, "已处理"); + CREATE(1, "创建"),FINISH(10, "已处理"); private int value; private String description; @@ -1196,7 +1196,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MOVE_ORDER_STATUS { - CREATE(1, "创建"), BE_HANDLE(10, "待处理"), FINISH(20, "已处理"); + CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理"); private int value; private String description; @@ -1476,6 +1476,189 @@ public class WmsEnumUtil { } /** + * 组件扫描单号 单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_ORDER_TYPE { + PO(10, "PO"), + ASN(20, "ASN"); + + private int value; + private String description; + + RC_ORDER_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; + } + } + + /** + * 组件统一返回提示 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_RESPONSE_TIPS { + + OK(1, true, "正确"), + NG(2, false, "失败"); + + private int value; + private boolean codeStatus; + private String description; + + RC_RESPONSE_TIPS(int value, boolean codeStatus, String description) { + this.value = value; + this.codeStatus = codeStatus; + this.description = description; + } + + public int getValue() { + return value; + } + + public boolean getCodeStatus() { + return codeStatus; + } + + public String getDescription() { + return description; + } + } + + /** + * 流程管家中触发源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_BUTLER_SOURCE { + + SCANNER(10, "扫描枪"), + SUBMIT(20, "提交按钮"), + RESET(30, "重置按钮"), + CHECK_DETAILS(40, "查看明细"), + DELETE_DETAILS(50, "明细(删除)"), + CLEAR_DETAILS(60, "明细（清空）"); + + private int value; + private String description; + + ACTION_BUTLER_SOURCE(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; + } + } + + /** + * PO条码表条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_SN_STATUS { + + fOUND(10, "创建"), + PRINTED(20, "已打印"), + RECEIPTED(30, "已收货"); + + private int value; + private String description; + + PO_SN_STATUS(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; + } + } + + /** + * 组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMPONENT_TYPE { + + PROCESS_HANDLING(10, "流程处理组件,"), + PROCESS_INITIALIZATION(20, "流程初始化组件"), + PROCESS_END(30, "流程结束组件"), + DETAIL_PROCESS(40, "明细处理组件"), + BACK_DISPLAY(50, "回显示组件"); + + private int value; + private String description; + + COMPONENT_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; + } + } + + /** * 作业步骤处理组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 ca6bba6..a108879 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 @@ -215,7 +215,7 @@ public class HqlPack { * @param result */ public static void getNumEqualPack(Object data,String columnName, StringBuffer result) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ + if (data != null) { data = getSafeParam(data); result.append(" and model."+columnName+" = " + data + ""); } @@ -239,7 +239,7 @@ public class HqlPack { * @param result */ public static void getNumEqualPackForZero(Object data,String columnName, StringBuffer result) { - if(data!=null&&Long.parseLong(data.toString()) >= 0){ + if (data != null && Long.parseLong(data.toString()) >= 0) { data = getSafeParam(data); result.append(" and model."+columnName+" = " + data + ""); } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java new file mode 100644 index 0000000..fdf6c5f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 流程管家模型 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-28 15:50 + * @Modify: + **/ +@Data +public class ActionButlerModel { + + private String orderNo; + + private String sn; + + private String aLId; + + private String userNo; + + private String fixNo; + + private String barCode; + + private String funCallName; +} 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 23fa593..754a668 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 @@ -56,7 +56,15 @@ public class SysMenu extends BaseBean { @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") private String menuClassPath; - + + @Column(name="MENU_GRADE") + @ApiParam(value ="资源等级", example = "1") + private String menuGrade; + + @Column(name="MENU_SORT") + @ApiParam(value ="资源排序", example = "1") + private String menuSort; + @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") private String menuUrl; 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 519c5f0..603a79a 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 @@ -121,7 +121,10 @@ public class CoreHqlPack { public static String packHqlSysDepartment(SysDepartment department){ StringBuffer result = new StringBuffer(); - // 查询参数封装 + if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ + department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } + HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); HqlPack.getStringLikerPack(department.getName(),"name",result); 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 9972172..52bdb57 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 @@ -2,9 +2,12 @@ package cn.estsh.i3plus.pojo.wms.bean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -14,6 +17,8 @@ import java.util.List; * @Modify: **/ @Data +@NoArgsConstructor +@AllArgsConstructor @Api("返回前端数据实体") public class WmsActionResponseBean { @@ -36,7 +41,21 @@ public class WmsActionResponseBean { public List options; @ApiParam("选中的明细数据") - public String details; - - + public List> details; + + @ApiParam(value = "结果代码") + public Boolean codeStatus; + + public WmsActionResponseBean(Boolean codeStatus, String message) { + this.codeStatus = codeStatus; + this.message = message; + } + + public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { + this.percent = percent; + this.message = message; + this.informations = informations; + this.details = details; + this.codeStatus = codeStatus; + } } 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 eeb7643..f492d9d 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 @@ -1,10 +1,12 @@ 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 java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -15,7 +17,7 @@ import java.util.List; **/ @Data @Api("接受前端数据实体") -public class WmsOperationBean { +public class WmsOperationBean extends BaseBean { @ApiParam("扫描内容") public String barCode; @@ -32,5 +34,5 @@ public class WmsOperationBean { public int sourceOwner; @ApiParam("选中的明细数据") - public String details; + public List> details; } 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 new file mode 100644 index 0000000..48b189c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -0,0 +1,78 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : PO条码表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-28 15:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOC_PO_SN") +@Api("PO条码信息") +public class WmsPoSn extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ApiParam(value = "数量", example = "0") + public Double qty; + + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 状态:10 = 创建，20 = 已打印，30 = 已收货 + */ + @Column(name="SN_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer snStatus; + + @Column(name="PACKAGE") + @ApiParam("包装名称") + public String packAge; + + @Column(name="SN_1D") + @ApiParam("一维条码") + public String snOneBarCode; + + @Column(name="SN_2D") + @ApiParam("二维条码") + public String snTwoBarCode; + + @Column(name="GROUP_NO") + @ApiParam("组条码") + public String groupNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java index 00e94fd..dc69f66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java @@ -13,4 +13,6 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface WmsASNMasterDetailsRepository extends BaseRepository { + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java new file mode 100644 index 0000000..2835f45 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.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.WmsPoSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : PO条码 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-28 15:29 + * @Modify: + **/ +@Repository +public interface WmsPoSnRepository 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 c597eff..8e9c428 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 @@ -1068,6 +1068,9 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + HqlPack.getNumEqualPack(wmsActionModule.getId(), "id", result); + HqlPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); + getStringBuilderPack(wmsActionModule, result); return result.toString(); @@ -1156,6 +1159,4 @@ public class WmsHqlPack { return result.toString(); } - - }