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

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

Browse Source
yun-zuoyi
sky.meng 6 years ago
parent 05c56e46b4 d7f15cddef
commit 2f1a3080ba
17 changed files with 113 additions and 30 deletions
Show Stats Download Patch File Download Diff File

5
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -884,4 +884,9 @@ public class CommonEnumUtil {
return tmp;
}
}
// 数据有效的静态常量
public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();
// 数据未删除的静态常量
public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
}

9
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -1761,6 +1761,15 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
public static DATA_OBJ_TYPE codeOf(Integer val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**

47
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
/**
@ -16,19 +17,55 @@ import java.io.Serializable;
public class WmsTaskInfoModel implements Serializable {
@ApiParam("任务单号")
public String orderNo;
@ApiParam("关联单号")
public String refSrc;
@Column(name = "TRANS_TYPE_CODE")
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@ApiParam(value = "任务状态")
public String taskStatus;
public Integer taskStatus;
@ApiParam("作业类型名称")
public String opTypeName;
@ApiParam(value = "交易类型代码")
private String transTypeCode;
@ApiParam("关联单号")
public String refSrc;
@ApiParam(value = "关联单据类型")
private String refType;
@Column(name = "ZDATE")
@ApiParam(value = "计划日期")
private String zdate;
@Column(name = "ZTIME")
@ApiParam(value = "计划时间")
private String ztime;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
public WmsTaskInfoModel() {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String refType, String zdate, String ztime, String custNo, String vendorNo) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
this.refType = refType;
this.zdate = zdate;
this.ztime = ztime;
this.custNo = custNo;
this.vendorNo = vendorNo;
}
}

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

@ -34,7 +34,7 @@ public class SapBase {
private String rechms;
@ApiParam(value = "同步标志", example = "-1")
private String synflg = "Y";
private String synflg = "N";
@ApiParam(value = "同步日期", example = "-1")
private String synymd;
@ -43,7 +43,7 @@ public class SapBase {
private String synhms;
@ApiParam(value = "处理标志", example = "-1")
private String actflg = "Y";
private String actflg = "N";
@ApiParam(value = "处理日期", example = "-1")
private String actymd;
@ -52,7 +52,7 @@ public class SapBase {
private String acthms ="00:00:00";
@ApiParam(value = "状态标志", example = "-1")
private String staflg = "Y";
private String staflg = "N";
@ApiParam(value = "顺序号", example = "-1")
private Integer seq = 1;
@ -62,11 +62,13 @@ public class SapBase {
public String getSynymdTime() {
SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD");
return format.format(new Date());
//format.format(new Date())
return "";
}
public String getSynhmsTime() {
SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
return format.format(new Date());
//format.format(new Date())
return "";
}
}

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

@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.List;
/**
* @Description : ASN订单明细信息
@ -45,7 +44,7 @@ public class WmsASNMasterDetails extends BaseBean {
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
public String item;
@Column(name = "QTY")
@ColumnDefault("0")

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

@ -35,7 +35,7 @@ public class WmsCSAdjustRange extends BaseBean {
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
public String item;
@Column(name="IS_ADJUST")
@ApiParam(value = "调整标识", example = "1")
@ -62,7 +62,7 @@ public class WmsCSAdjustRange extends BaseBean {
public String unit;
public WmsCSAdjustRange(){}
public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
public WmsCSAdjustRange(String orderNo, String item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
this.orderNo = orderNo;
this.item = item;
this.isAdjust = isAdjust;

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

@ -39,7 +39,7 @@ public class WmsCSOrderDetails extends BaseBean {
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
public String item;
@Column(name = "QTY")
@ColumnDefault("0")

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

@ -34,7 +34,7 @@ public class WmsCSRange extends BaseBean {
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
public String item;
@Column(name = "PART_NO")
@ApiParam("物料编码")

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

@ -34,7 +34,11 @@ public class WmsDataAuth extends BaseBean {
@Column(name = "DATA_OBJ")
@ApiParam(value = "数据对象")
private String dataObj;
private Integer dataObj;
public String getDataObjString() {
return String.valueOf(dataObj);
}
@Column(name = "DATA_OBJ_VALUE")
@ApiParam(value = "数据对象值")

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

@ -41,7 +41,7 @@ public class WmsDocMovementDetails extends BaseBean {
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
public String item;
@Column(name = "QTY")
@ColumnDefault("0")

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

@ -39,7 +39,7 @@ public class WmsQCDetails extends BaseBean {
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
public String item;
@Column(name = "QTY")
@ColumnDefault("0")

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

@ -35,7 +35,7 @@ public class WmsQCTrans extends BaseBean {
@Column(name="ITEM")
@ApiParam("行号")
public Integer item;
public String item;
/**
* 状态:1=创建,10=已处理

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

@ -151,6 +151,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "客户条码")
private String custSn;
@Column(name = "ERP_ZONE_NO")
@ApiParam(value = "ERP库存地")
public String erpZoneNo;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;
@ -219,6 +223,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "ERP库存地集合")
public List<String> erpZoneNoList;
@Transient
@ApiParam(value = "ERP库存地")
public String erpZoneNo;
public WmsStockSn(){}

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
Unescape Escape View File

@ -5,7 +5,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.util.List;
/**
@ -23,7 +22,7 @@ public class WmsDataAuthModel extends BaseBean {
private String roleCode;
@ApiParam("数据对象")
private String dataObj;
private Integer dataObj;
@ApiParam("数据对象值")
private String dataObjValue;

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

@ -0,0 +1,12 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsBomTotal;
import org.springframework.stereotype.Repository;
/**
* Created by Administrator on 2019/6/25.
*/
@Repository
public interface WmsBomTotalRepository extends BaseRepository<WmsBomTotal,Long> {
}

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

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
/**
@ -14,4 +16,11 @@ import org.springframework.stereotype.Repository;
@Repository
public interface WmsZonesRepository extends BaseRepository<WmsZones ,Long> {
/**
* 根据工厂代码和存储编号查询存储区信息
* @param organizeCode 工厂代码
* @param zoneNo 存储区编号
* @return 存储区信息
*/
WmsZones getFirstByOrganizeCodeAndZoneNo(String organizeCode, String zoneNo);
}

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

@ -21,7 +21,6 @@ import java.util.stream.Collectors;
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-10-31 10:45
* @CreateDate : 2019-06-25
* @Modify:
**/
public class WmsHqlPack {
@ -1466,9 +1465,7 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result);
// String data = String.join(",", roleIds);
DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result);
DdlPreparedPack.getInPackList(roleIds, "roleCode", result);
getStringBuilderPack(dataAuth, result);
return result;
@ -1615,8 +1612,8 @@ public class WmsHqlPack {
if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) {
DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result);
}
if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) {
DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
if (wmsDataAuth.getDataObj() != null && wmsDataAuth.getDataObj().intValue() != 0) {
DdlPreparedPack.getNumEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
}
if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) {
DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
@ -1932,8 +1929,10 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
if(wmsProdCfgType != null){
DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
}
DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
// getStringBuilderPack(wmsProdCfgType, result);

Write Preview
Loading…
Cancel
Save