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 3675175bf1 d9b1be4622
commit f64d1fb89f
3 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -115,10 +115,6 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "是否散件", example = "1")
private Integer isPart;
@Column(name = "IS_SN")
@ApiParam(value = "是否指定条码", example = "1")
private Integer isSn;
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;

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

@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean {
@Column(name = "SNP")
@ApiParam("标准包装")
public Integer snp;
public Double snp;
/**
* 是否免费:0=计费,1=免费

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

@ -136,18 +136,19 @@ public class WmsHqlPack {
* @param wmsDocMovementMaster
* @return
*/
public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
DdlPackBean packBean = new DdlPackBean();
// StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
getStringBuilderPack(wmsDocMovementMaster, result);
getStringBuilderPack(wmsDocMovementMaster, packBean);
return result.toString();
return packBean;
}
/**
@ -984,28 +985,28 @@ public class WmsHqlPack {
* @param wmsMoveDetails
* @return
*/
public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result);
HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result);
HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result);
HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result);
HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result);
getStringBuilderPack(wmsMoveDetails, result);
public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) {
DdlPackBean packBean = new DdlPackBean();
// StringBuffer result = new StringBuffer();
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean);
DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean);
DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean);
getStringBuilderPack(wmsMoveDetails, packBean);
return result.toString();
return packBean;
}
/**

Write Preview
Loading…
Cancel
Save