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 0612ef5..3595182 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; @@ -1514,14 +1514,80 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RC_RESPONSE_TIPS { - OK(10, "正确"), - FAIL(20, "失败"), - NO_SKIP(30, "不跳转"); + OK(true, "正确"), + NG(false, "失败"); + + private boolean codeStatus; + private String description; + + RC_RESPONSE_TIPS(boolean codeStatus, String description) { + this.codeStatus = codeStatus; + this.description = description; + } + + 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; - RC_RESPONSE_TIPS(int value, String description) { + PO_SN_STATUS(int value, String description) { this.value = value; this.description = description; } 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-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..7e2a33c 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,12 +121,21 @@ 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); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + // 默认排序 + if(department.getOrderByParam().isEmpty()){ + department.setOrderByParam("departmentSort"); + department.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + return result.toString(); } 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 5b8eb5a..3a19099 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,8 +41,21 @@ public class WmsActionResponseBean { public List options; @ApiParam("选中的明细数据") - public String details; - - @ApiParam("信息代码") - public Integer code; + 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..7367bd0 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -32,5 +33,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..2e8af6e 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 @@ -1156,6 +1156,4 @@ public class WmsHqlPack { return result.toString(); } - - }