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

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

Browse Source
yun-zuoyi
许心洁 5 years ago
parent 2d47eeb84d 12edbb64d5
commit be272fd12e
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File

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

@ -869,7 +869,8 @@ public class WmsEnumUtil {
WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
OTHER_IN(730, "OTHER_IN", "其它入库"),
OTHER_OUT(740, "OTHER_OUT", "其它出库"),
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账");
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
private int value;
private String code;

38
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class SwebHqlPack {
}
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(purchaseOrder, result);
}
@ -81,11 +81,10 @@ public class SwebHqlPack {
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue());
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue());
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue());
//poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue());
DdlPreparedPack.getInPackList(poStatus, "poStatus", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(purchaseOrder, result);
}
@ -94,7 +93,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebPackage, result);
}
@ -102,7 +101,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result);
DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebConfig, result);
}
@ -121,7 +120,7 @@ public class SwebHqlPack {
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result);
HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return result.toString();
}
@ -134,7 +133,7 @@ public class SwebHqlPack {
// 封装有效状态和删除状态
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(model, result);
}
@ -142,7 +141,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebProcurementPlanOrder, result);
}
@ -151,7 +150,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebProcurementPlanOrderDetails, result);
}
@ -159,7 +158,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(vendorRel, result);
}
@ -208,22 +207,13 @@ public class SwebHqlPack {
return buildHql(details, result);
}
// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
// DdlPackBean result = new DdlPackBean();
// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
// return buildHql(master, result);
// }
public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(details, result);
}
@ -242,7 +232,7 @@ public class SwebHqlPack {
if (!StringUtil.isEmpty(capcity.getDateEnd())) {
DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result);
}
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(capcity, result);
}
@ -260,7 +250,7 @@ public class SwebHqlPack {
if (!StringUtil.isEmpty(alarm.getDateEnd())) {
DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result);
}
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(alarm, result);
}
@ -272,7 +262,7 @@ public class SwebHqlPack {
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
}
DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(stock, result);
}
@ -285,7 +275,7 @@ public class SwebHqlPack {
}
DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(alarm, result);
}
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -103,6 +105,11 @@ public class WmsPoSn extends BaseBean {
@ApiParam(value = "供应商编码")
public String vendorNo;
// @Column(name = "DATE_CODE", nullable = false)
// @ApiParam(value = "供应商生产批次")
// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
// public String dateCode = "";
@ApiParam(value = "供应商名称")
@Transient
public String vendorNameRdd;
@ -119,8 +126,9 @@ public class WmsPoSn extends BaseBean {
@Transient
public String lotNo;
@Transient
@ApiParam(value = "生产日期")
@Column(name = "DATE_CODE", nullable = false)
@ApiParam(value = "供应商生产日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String dateCode;
@Transient

Write Preview
Loading…
Cancel
Save