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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
crish 6 years ago
parent 4173f0637f 8a89b95ebf
commit d8824ab066
12 changed files with 129 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
@ -21,7 +22,7 @@ import java.util.List;
**/
@Data
@Api("订单基类")
public class BaseOrder extends BaseAPS {
public class BaseOrder extends BaseCode {
@Column(name="COUNT")
@ApiParam(value ="数量")
private Double count;

5
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java
Unescape Escape View File

@ -15,6 +15,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.lang.reflect.Method;
import java.sql.JDBCType;
/**
* @Description :字段信息
@ -75,6 +76,10 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="主键标识")
private Boolean mainKey;
@Column(name="JDBC_TYPE")
@ApiParam(value ="数据库类型")
private JDBCType jdbcType;
@JsonIgnore
private transient Class<? extends BaseBean> clazz;
@JsonIgnore

5
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
Unescape Escape View File

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -36,4 +38,7 @@ public class Inventory extends BaseOrder {
@ApiParam(value ="多余量")
private Double excessCount;
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}
}

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

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder {
@Column(name="EXCESS_COUNT")
@ApiParam(value ="多余量")
private Double excessCount;
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}
}

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

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder {
@Column(name="CALC_LEAD_TIME")
@ApiParam(value ="提前期计算值")
private String calcLeadTime;
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java
Unescape Escape View File

@ -243,7 +243,7 @@ public class BeanRelationUtil {
* 将指定包下的类加载到内存中
* @param packName
*/
private static List<Class<?>> loadClass(String packName) {
public static List<Class<?>> loadClass(String packName) {
List<Class<?>> clses = new ArrayList<>();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
String strFile = packName.replaceAll("\\.", "/");

2
modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml
Unescape Escape View File

@ -2,6 +2,6 @@
<Class name="ImportProject">
<Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
</Relation>
<Relation field="Details" name="ImportDetail" reverset="Project" type="ONE_TO_MULTI" owner="true">
<Relation field="Details" name="ImportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

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

@ -377,6 +377,44 @@ public class WmsEnumUtil {
}
/**
* 条码打印状态 （库存条码打印字段使用）
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_STATUS {
PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码");
private int value;
private String description;
PRINT_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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 库位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -560,7 +598,9 @@ public class WmsEnumUtil {
ASN(200, "ASN", "ASN"),
PO(210, "PO", "PO"),
QC(220, "QC", "QC"),
AMPR(230, "AMPR", "AMPR");
AMPR(230, "AMPR", "AMPR"),
FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工");
private int value;

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

@ -35,8 +35,11 @@ public class WmsActionResponseBean<Obj> implements Serializable {
@ApiParam("进度")
public String percent = "消息提示：";
@ApiParam("当前步骤")
public Integer currentStep;
@ApiParam("当前步骤类型名称")
public String currentStepTypeName;
@ApiParam("当前步骤名称")
public String currentStepName;
@ApiParam("总步数")
public int totalStep;

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

@ -84,6 +84,10 @@ public class WmsActionGroupDetails extends BaseBean {
private String asName;
@Transient
@ApiParam(value = "步骤类型名称")
private String atName;
@Transient
@ApiParam(value = "流程名称")
private String agName;
@ -112,11 +116,13 @@ public class WmsActionGroupDetails extends BaseBean {
@ApiParam(value = "是否自动开窗", example = "2")
private Integer isAutoOpenWindow;
@Column(name = "SEARCH_KEY")
@ApiParam(value = "搜索KEY")
public String searchKey;
private String searchKey;
@Column(name = "GROUP_KEY")
@ApiParam(value = "分组KEY")
public String groupKey;
private String groupKey;
public int getSeqVal() {
return this.seq == null ? 0 : this.seq;
@ -153,4 +159,34 @@ public class WmsActionGroupDetails extends BaseBean {
public int getLenCheckVal() {
return this.lenCheck == null ? 0 : this.lenCheck;
}
public WmsActionGroupDetails() {
}
public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper,
Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId,
String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow,
Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) {
this.agId = agId;
this.seq = seq;
this.okSeq = okSeq;
this.ngSeq = ngSeq;
this.valueType = valueType;
this.toUpper = toUpper;
this.lenCheck = lenCheck;
this.regularCheck = regularCheck;
this.regularCheckFailMsg = regularCheckFailMsg;
this.asId = asId;
this.atId = atId;
this.asName = asName;
this.atName = atName;
this.goToBtnCode = goToBtnCode;
this.goToBtnName = goToBtnName;
this.preShow = preShow;
this.showAmId = showAmId;
this.isCommitAble = isCommitAble;
this.isAutoOpenWindow = isAutoOpenWindow;
this.searchKey = searchKey;
this.groupKey = groupKey;
}
}

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

@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
private Integer snStatus;
/**
* 1:已打印；2：未打印
* 1:已打印；2：未打印；3：退料生成条码
*/
@Column(name = "PRINTED")
@ApiParam(value = "是否打印", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
private Integer printed;
@Column(name = "PDATE")

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

@ -208,6 +208,12 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
// 查询计划时间在指定范围的单号，查询这些单号的数据
if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
}
getStringBuilderPack(wmsPOMaster, result);
return result;
@ -593,6 +599,11 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
// 查询计划时间在指定范围的单号，查询这些单号的数据
if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) {
DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result);
}
getStringBuilderPack(wmsASNMaster, result);
return result;
@ -1529,6 +1540,12 @@ public class WmsHqlPack {
DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
result.setOrderByStr(wmsStockSn.orderBy());
if(wmsStockSn.getPrinted()!= null){
if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result);
}
}
getStringBuilderPack(wmsStockSn, result);
return result;
}

Write Preview
Loading…
Cancel
Save