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

增加一键下发功能。

Browse Source
yun-zuoyi
钮海涛 4 years ago
parent 3af6e02e52
commit 462f5c9d58
4 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -52,6 +52,10 @@ public class SerialNumber extends BaseAPS {
@ApiParam(value ="插单流水号")
private Integer hNumber = 0;
@Column(name="Z_NUMBER")
@ApiParam(value ="补充订单流水号")
private Integer zNumber = 0;
@Column(name="LAST_DATE")
@ApiParam(value ="最后生成日期")
private Date lastDate;

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

@ -102,7 +102,7 @@ public class WorkRelation extends BaseAPS {
}
public void setWorkInput(WorkInput input) {
this.workInputId = input != null ? input.getId() : 0l;
this.workInputId = input != null ? input.getId() : 0L;
BeanRelation.set(this, EWorkRelation.WorkInput, input);
}
@ -111,7 +111,7 @@ public class WorkRelation extends BaseAPS {
}
public void setWorkOutput(WorkOutput output) {
this.workOutputId = output != null ? output.getId() : 0l;
this.workOutputId = output != null ? output.getId() : 0L;
BeanRelation.set(this, EWorkRelation.WorkOutput, output);
}
@ -120,7 +120,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPrevWork(Work work) {
this.prevWorkId = work != null ? work.getId() : 0l;
this.prevWorkId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PrevWork, work);
}
@ -129,7 +129,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPostWork(Work work) {
this.postWorkId = work != null ? work.getId() : 0l;
this.postWorkId = work != null ? work.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PostWork, work);
}
@ -138,7 +138,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPrevOrder(BaseOrder order) {
this.prevOrderId = order != null ? order.getId() : 0l;
this.prevOrderId = order != null ? order.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PrevOrder, order);
}
@ -147,7 +147,7 @@ public class WorkRelation extends BaseAPS {
}
public void setPostOrder(BaseOrder order) {
this.postOrderId = order != null ? order.getId() : 0l;
this.postOrderId = order != null ? order.getId() : 0L;
BeanRelation.set(this, EWorkRelation.PostOrder, order);
}
@ -156,7 +156,7 @@ public class WorkRelation extends BaseAPS {
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
this.materialId = material != null ? material.getId() : 0L;
BeanRelation.set(this, EWorkRelation.Material, material);
}
}

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

@ -23,7 +23,7 @@ public class BeanRelation {
}
}
private static Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
private static final Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
private static BeanRelation get() {
Long userId = 0L;
BeanRelation relation = relations.get(userId);
@ -214,8 +214,8 @@ public class BeanRelation {
return result;
}
private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self, Predicate<T> pred,
Enum<?>[] holders, int index) {
private static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self, Predicate<T> pred,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (self == bean) {
return false;
@ -270,10 +270,6 @@ public class BeanRelation {
/**
* 设值两个对象之间的关联
*
* @param bean
* @param holder
* @param relaBean
*/
public static void set(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null || holder == null) {
@ -309,11 +305,6 @@ public class BeanRelation {
/**
* 建立对象之间双向引用实现
*
* @param bean
* @param holder
* @param relaBean
* @param reverseHolder
*/
private static void setImpl(BaseBean bean, Enum<?> holder, BaseBean relaBean, Enum<?> reverseHolder) {
get(bean).get(holder).add(relaBean);
@ -324,8 +315,6 @@ public class BeanRelation {
/**
* 移除对象所有关系
*
* @param bean
*/
public static void remove(BaseBean bean) {
if (bean == null) {
@ -342,9 +331,6 @@ public class BeanRelation {
/**
* 移除关联
*
* @param bean
* @param holder
*/
public static void remove(BaseBean bean, Enum<?> holder) {
if (bean == null || holder == null) {
@ -365,10 +351,6 @@ public class BeanRelation {
/**
* 移除关联的指定对象
*
* @param bean
* @param holder
* @param relaBean
*/
public static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null || holder == null) {
@ -384,7 +366,6 @@ public class BeanRelation {
/**
* 移除关联关系中的对象，并不会移除关联的对象的关系
* @param bean
*/
public static void erase(BaseBean bean) {
get().caches.get(bean.getClass()).remove(bean.getId());
@ -392,10 +373,6 @@ public class BeanRelation {
/**
* 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。
* @param bean
* @param fun
* @param holders
* @param <T>
*/
public static <T extends BaseBean> void recursion(BaseBean bean, Predicate<T> fun, Enum<?>... holders) {
if (holders.length == 0) {
@ -406,11 +383,6 @@ public class BeanRelation {
/**
* 按指定路径，递归调用实现。采用广度优先搜索。
* @param bean
* @param fun
* @param holders
* @param index
* @param <T>
*/
private final static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
Enum<?>[] holders, int index) {

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

@ -1148,7 +1148,8 @@ public class ApsEnumUtil {
PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"),
INVENTORY("INVENTORY", "W", "库存订单"),
SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"),
INSERTED_ORDER("INSERTED_ORDER", "I", "插单");
INSERTED_ORDER("INSERTED_ORDER", "I", "插单"),
SUPPLY_ORDER("SUPPLY_ORDER", "Z", "补充订单");
private final String value;
private final String prefix;

Write Preview
Loading…
Cancel
Save