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
gragon.xu 7 years ago
parent 9189ca1bbd fb2de0496d
commit e6775e65f6
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File

7
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java
Unescape Escape View File

@ -48,6 +48,13 @@ public class SysFile extends BaseBean {
}
}
@Column(name="DFS_GROUP_NAME")
@ApiParam(value ="FastDfs Group 名称(后台使用)")
private String dfsGroupName;
@Column(name="DFS_FILE_NAME")
@ApiParam(value ="FastDfs 文件名称(后台使用)")
private String dfsFileName;
@Column(name="FILE_PATH")
@ApiParam(value ="文件路径")

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

@ -322,7 +322,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result);
HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -346,7 +346,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
}
HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -366,7 +366,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result);
HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result);
HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -381,7 +381,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wareHouse.getName(), "name", result);
HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result);
HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -399,7 +399,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -407,7 +407,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -419,6 +419,7 @@ public class WmsHqlPack {
*/
public static String packHqlWmsZones(WmsZones wmsZones) {
StringBuffer result = new StringBuffer();
//有效性
HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result);
//仓库代码
@ -427,6 +428,9 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result);
//存储区代码
HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
//删除标记
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -461,8 +465,10 @@ public class WmsHqlPack {
*/
public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
StringBuffer result = new StringBuffer();
//有效性
//有效性,删除标记
HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
//供应商编号
HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
//供应商简称
@ -490,7 +496,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(), "poNo", result);
//有效性
HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
return result.toString();
}
@ -508,16 +514,20 @@ public class WmsHqlPack {
//发运单号
HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
//客户编码
HqlPack.getStringLikerPack(wmsShopping.getCustNo(), "custNo", result);
HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
//条码
HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result);
//发运状态
HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result);
HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result);
//是否删除
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
//工厂
HqlPack.getStringEqualPack(wmsShopping.getOrganizeCode(),"organizeCode",result);
return result.toString();
}
/**
* 产品发运信息 查询条件封装
* 抽点记录信息 查询条件封装
*
* @param wmsCheckFactRecord
* @return
@ -536,6 +546,10 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result);
//供应商编号
HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result);
//是否删除
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
//工厂
HqlPack.getStringEqualPack(wmsCheckFactRecord.getOrganizeCode(),"organizeCode",result);
return result.toString();
}
@ -548,7 +562,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//有效性
HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -575,7 +589,7 @@ public class WmsHqlPack {
//有效性
HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -587,6 +601,7 @@ public class WmsHqlPack {
*/
public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(), "woNo", result);
HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(), "partNo", result);
@ -604,7 +619,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -622,7 +637,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(), "isDeleted", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
}

Write Preview
Loading…
Cancel
Save