增加业务类型字段、修改临时变量字段类型

修改hql查询字段
yun-zuoyi
陈思洁 6 years ago
parent cb49d8d848
commit 617bb73dad

@ -121,7 +121,7 @@ public class WmsCSOrderDetails extends BaseBean {
*/
@Transient
@ApiParam("差异类型")
public String differenceType;
public Integer differenceType;
public Double getQty() {
return this.qty == null ? 0 : this.qty;

@ -145,6 +145,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam("交易类型名称")
private String transTypeName;
@Transient
@ApiParam("业务类型编码")
private Integer busiTypeCode;
public WmsMoveDetails(){}
public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@ -173,7 +177,7 @@ public class WmsMoveDetails extends BaseBean {
public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){
this.organizeCode = organizeCode;
this.partNo = partNo;
this.orderNo = orderNo;
@ -194,6 +198,6 @@ public class WmsMoveDetails extends BaseBean {
this.refSrc = refSrc;
this.vendorNo = vendorNo;
this.custNo = custNo;
this.busiTypeCode = busiTypeCode;
}
}

@ -155,7 +155,7 @@ public class WmsMoveSn extends BaseBean {
@Transient
@ApiParam("业务类型编码")
private String busiTypeCode;
private Integer busiTypeCode;
@Transient
@ -194,7 +194,7 @@ public class WmsMoveSn extends BaseBean {
return finishedCounts == null ? 0L : this.finishedCounts;
}
public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode, String transTypeCode, String refSrc) {
public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode, String transTypeCode, String refSrc) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.destQty = destQty;
@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean {
}
public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo){
Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode){
this.organizeCode=organizeCode;
this.orderNo=orderNo;
this.item=item;
@ -235,6 +235,6 @@ public class WmsMoveSn extends BaseBean {
this.refSrc = refSrc;
this.destZoneNo = destZoneNo;
this.destWhNo =destWhNo;
this.busiTypeCode = busiTypeCode;
}
}

@ -40,10 +40,13 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
}
// 封装有效状态和删除状态
// 封装有效状态、删除状态、创建人和创建时间
DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true);
return hqlStr;
}
@ -124,9 +127,6 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
getStringBuilderPack(wmsDocMovementDetails, result);
return result;
@ -165,7 +165,6 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCreateUser(),"createUser",packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
@ -206,8 +205,6 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringLikerPack(wmsPOMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),wmsPOMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsPOMaster, result);
return result;
@ -592,8 +589,6 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
DdlPreparedPack.getStringLikerPack(wmsASNMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),wmsASNMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsASNMaster, result);
@ -623,9 +618,6 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
//单据来源
DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
DdlPreparedPack.getStringLikerPack(wmsShipping.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsShipping.getCreateDateTimeStart(),wmsShipping.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsShipping, result);
getStringBuilderPack(wmsShipping, result);
@ -713,8 +705,6 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCreateUser(), "createUser", result);
DdlPreparedPack.timeBuilder(wmsFGInStock.getCreateDateTimeStart(),wmsFGInStock.getCreateDateTimeEnd(),"createDatetime",result,true);
getStringBuilderPack(wmsFGInStock, result);
@ -912,7 +902,6 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
getStringBuilderPack(wmsStockQuan, result);
return result;
@ -1059,11 +1048,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true);
getStringBuilderPack(wmsMoveMaster, result);
@ -1300,7 +1285,8 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
DdlPreparedPack.timeBuilder(wmsCSOrderMaster.getCreateDateTimeStart(),
wmsCSOrderMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
getStringBuilderPack(wmsCSOrderMaster, result);
return result;

Loading…
Cancel
Save