I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

Browse Source
yun-zuoyi
amy 7 years ago
parent 1eb12350b2 41b0855f5d
commit 20152e7efd
10 changed files with 251 additions and 5 deletions
Show Stats Download Patch File Download Diff File

50
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java
Unescape Escape View File

@ -0,0 +1,50 @@
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 : 作业步骤处理组件
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2018-11-22 16:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_MODULE")
@Api("作业步骤处理组")
public class WmsActionModule extends BaseBean {
@Column(name="AM_NAME")
@ApiParam("组件名称")
public String amName;
@Column(name="AM_DESC")
@ApiParam("组件描述")
public String amDesc;
@Column(name="CALL_CLASS")
@ApiParam("实现类")
public String callClass;
@Column(name="CALL_FUN")
@ApiParam("调用方法")
public String callFun;
@Column(name="AM_TYPE")
@ApiParam(value = "组件类型", example = "0")
public Integer amType;
}

50
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java
Unescape Escape View File

@ -0,0 +1,50 @@
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 : 作业步骤处理组参数
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2018-11-22 16:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_MODULE_PARAM")
@Api("作业步骤处理组参数")
public class WmsActionModuleParam extends BaseBean {
@Column(name="AM_ID")
@ApiParam("组件ID")
public Long amID;
@Column(name="PARAM_CODE")
@ApiParam("参数编码")
public String paramCode;
@Column(name="PARAM_NAME")
@ApiParam("参数名称")
public String paramName;
@Column(name="PARAM_VALUE_LIST")
@ApiParam("参数可选值列表")
public String paramValueList;
@Column(name="PARAM_TYPE")
@ApiParam(value = "参数类型", example = "0")
public Integer paramType;
}

44
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
Unescape Escape View File

@ -0,0 +1,44 @@
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 javax.persistence.Entity;
import java.util.List;
/**
* @Description : PDA传输到后台的实体bean对象
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-22 15:58
* @Modify:
**/
@Data
@Api("返回前端数据实体")
public class WmsActionResponseBean extends BaseBean {
@ApiParam("进度")
public Double percent;
@ApiParam("当前步骤")
public Integer currentStep;
@ApiParam("总步数")
public int totalStep;
@ApiParam("提示信息")
public String message;
@ApiParam("列表信息")
public List<String> informations;
@ApiParam("可选项")
public List<String> options;
@ApiParam("选中的明细数据")
public String details;
}

13
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java
Unescape Escape View File

@ -49,6 +49,15 @@ public class WmsActionStep extends BaseBean {
private String atNameCRdd;
@Column(name = "AT_ID")
@ApiParam(value = "步骤类型编号")
private String atId;
@ApiParam(value = "步骤类型编号", example = "0")
private Long atId;
//get单独处理
public Long getAtId() {
if(atId != null) {
return atId.longValue();
}else{
return atId;
}
}
}

15
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java
Unescape Escape View File

@ -1,7 +1,10 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -29,7 +32,8 @@ import javax.persistence.Table;
public class WmsActionStepCall extends BaseBean {
@Column(name="AS_ID")
@ApiParam("作业步骤ID")
@ApiParam(value = "作业步骤ID",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
public Long asId;
@Column(name="SEQ")
@ -37,6 +41,13 @@ public class WmsActionStepCall extends BaseBean {
public Integer seq;
@Column(name="AM_ID")
@ApiParam("处理组件ID")
@ApiParam(value = "处理组件ID",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
public Long amId;
@ApiParam(value = "组件名称")
public transient String amName;
@ApiParam(value = "组件描述")
public transient String amDesc;
}

43
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
Unescape Escape View File

@ -0,0 +1,43 @@
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;
import java.util.List;
/**
* @Description : PDA传输到后台的实体bean对象
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-22 15:58
* @Modify:
**/
@Data
@Api("接受前端数据实体")
public class WmsOperationBean extends BaseBean {
@ApiParam("扫描内容")
public String barCode;
@ApiParam("可选项的值")
public List<String> options;
/**
* 触发源:10=扫描枪,
* 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)
* 60=明细（清空）
*/
@ApiParam("触发源")
public int sourceOwner;
@ApiParam("选中的明细数据")
public String details;
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java
Unescape Escape View File

@ -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.WmsActionModuleParam;
import org.springframework.stereotype.Repository;
/**
* @Description : 作业步骤处理组件参数
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2018-11-22 17:01
* @Modify:
**/
@Repository
public interface WmsActionModuleParamRepository extends BaseRepository<WmsActionModuleParam, Long> {
}

15
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule;
import org.springframework.stereotype.Repository;
/**
* @Description : 作业步骤处理组件
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2018-11-22 17:01
* @Modify:
**/
@Repository
public interface WmsActionModuleRepository extends BaseRepository<WmsActionModule, Long> {
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java
Unescape Escape View File

@ -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.WmsActionStepCall;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
/**
* @Description : 作业步骤调用信息
@ -11,4 +15,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall;
* @Modify:
**/
public interface WmsActionStepCallRepository extends BaseRepository<WmsActionStepCall, Long> {
@Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ")
List<WmsActionStepCall> findWmsActionStepCallByAmid(@Param("id") long id);
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -469,7 +469,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//发运单号
HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
//客户编码
HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
//物料编码

Write Preview
Loading…
Cancel
Save