Merge remote-tracking branch 'origin/dev' into dev

yun-zuoyi
crish 6 years ago
commit 976a37bff6

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
@Column(name="AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="AREA_NAME")
@ApiParam("区域名称")
private String areaName;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesAreaRepository extends BaseRepository<MesArea, Long> {
}

@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -26,7 +23,10 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_ASN_MASTER")
@Table(name = "WMS_DOC_ASN_MASTER", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("ASN主表信息")
public class WmsASNMaster extends BaseBean {

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.util.List;
@ -28,7 +29,13 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_ASN_DETAILS")
@Table(name = "WMS_DOC_ASN_DETAILS", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "SN_1D"),
@Index(columnList = "SN_2D"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("ASN订单明细信息")
public class WmsASNMasterDetails extends BaseBean {
@Column(name = "PART_NO")

@ -4,17 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :
@ -28,7 +24,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_STEP_CALL")
@Table(name="WMS_ACTION_STEP_CALL", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "AS_ID"),
@Index(columnList = "AM_ID")
})
@Api("作业步骤调用信息")
public class WmsActionStepCall extends BaseBean {

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :()
@ -26,7 +23,12 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
@Table(name = "WMS_DOC_MOVEMENT_DETAILS", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "SRC_NO"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("移库单明细表")
public class WmsDocMovementDetails extends BaseBean {
@Column(name = "PART_NO")

@ -9,10 +9,7 @@ import lombok.ToString;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -27,7 +24,13 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_MOVEMENT_MASTER")
@Table(name = "WMS_DOC_MOVEMENT_MASTER", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "REF_NO"),
@Index(columnList = "ERP_SRC_NO"),
@Index(columnList = "BUSI_TYPE"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("移库单表")
@ToString
public class WmsDocMovementMaster extends BaseBean {

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :
@ -27,7 +24,12 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_MOVEMENT_SN")
@Table(name="WMS_DOC_MOVEMENT_SN", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "SN"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("移库条码信息")
public class WmsDocMovementSn extends BaseBean {

@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :
@ -25,7 +22,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_MOVE_DETAILS")
@Table(name="WMS_MOVE_DETAILS", indexes = {
@Index(columnList = "PART_NO"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("库存移动单明细信息")
public class WmsMoveDetails extends BaseBean {

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -24,7 +25,11 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_MOVE_MASTER")
@Table(name = "WMS_MOVE_MASTER", indexes = {
@Index(columnList = "TRANS_TYPE_CODE"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("库存移动单主表信息")
public class WmsMoveMaster extends BaseBean {

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :
@ -26,7 +23,12 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_MOVE_SN")
@Table(name="WMS_MOVE_SN", indexes = {
@Index(columnList = "PART_NO"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "SN"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("库存移动单条码信息")
public class WmsMoveSn extends BaseBean {

@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -26,7 +23,10 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_PO_MASTER")
@Table(name = "WMS_DOC_PO_MASTER", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("PO主表信息")
public class WmsPOMaster extends BaseBean {

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description : PO
@ -26,7 +23,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_PO_DETAILS")
@Table(name = "WMS_DOC_PO_DETAILS", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("PO订单明细信息")
public class WmsPOMasterDetails extends BaseBean {
@Column(name = "PART_NO")

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -26,7 +27,13 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_PO_SN")
@Table(name="WMS_DOC_PO_SN", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "SN_1D"),
@Index(columnList = "SN_2D"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("PO条码信息")
public class WmsPoSn extends BaseBean {

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -22,7 +23,11 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name = "WMS_STOCK_QUAN")
@Table(name = "WMS_STOCK_QUAN", indexes = {
@Index(columnList = "WH_NO"),
@Index(columnList = "ZONE_NO"),
@Index(columnList = "LOCATE_NO")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.Date;
/**
@ -25,7 +22,20 @@ import java.util.Date;
**/
@Data
@Entity
@Table(name = "WMS_STOCK_SN")
@Table(name = "WMS_STOCK_SN", indexes = {
@Index(columnList = "PACKAGE_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "REF_SRC"),
@Index(columnList = "SN"),
@Index(columnList = "SN_2D"),
@Index(columnList = "WH_NO"),
@Index(columnList = "ZONE_NO"),
@Index(columnList = "LOCATE_NO"),
@Index(columnList = "LOT_NO"),
@Index(columnList = "FIX_LOT_NO"),
@Index(columnList = "DATE_CODE"),
@Index(columnList = "VENDOR_NO")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -25,7 +26,11 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TASK_DETAILS")
@Table(name = "WMS_TASK_DETAILS", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "ITEM_STATUS")
})
@Api("作业任务明细信息")
public class WmsTaskDetails extends BaseBean {

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -25,7 +26,13 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TRANS_QUAN")
@Table(name = "WMS_TRANS_QUAN", indexes = {
@Index(columnList = "WH_NO"),
@Index(columnList = "ZONE_NO"),
@Index(columnList = "LOCATE_NO"),
@Index(columnList = "REF_SRC"),
@Index(columnList = "ORGANIZE_CODE")
})
@Api("库存交易信息")
public class WmsTransQuan extends BaseBean {

@ -86,8 +86,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
getStringBuilderPack(wmsPOMasterDetails, result);
@ -142,7 +142,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
@ -598,25 +598,25 @@ public class WmsHqlPack {
* @param wmsShopping
* @return
*/
public static String packHqlWmsShipping(WmsShopping wmsShopping) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsShipping(WmsShopping wmsShopping) {
DdlPackBean result = new DdlPackBean();
//发运单号
HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
//客户编码
HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
DdlPreparedPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
//物料编码
HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
//条码
HqlPack.getStringEqualPack(wmsShopping.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsShopping.getSn(), "sn", result);
//发运状态
HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result);
//特殊发货标志
HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result);
getStringBuilderPack(wmsShopping, result);
return result.toString();
return result;
}
/**
@ -728,21 +728,21 @@ public class WmsHqlPack {
* @param wmsSnPrint
* @return
*/
public static String packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) {
DdlPackBean result = new DdlPackBean();
// 来源单据类型
HqlPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
// 来源单据号
HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
// 打印机
HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
// 打印机状态
HqlPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
getStringBuilderPack(wmsSnPrint, result);
return result.toString();
return result;
}
/**
@ -826,25 +826,23 @@ public class WmsHqlPack {
}
/**
*
*
* @param wmsTempOrderLock
* @return
*
* @return
*/
public static String packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) {
DdlPackBean result = new DdlPackBean();
// 订单号
HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
// 业务类型
HqlPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result);
DdlPreparedPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result);
// 物料代码
HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result);
getStringBuilderPack(wmsTempOrderLock, result);
return result.toString();
return result;
}
/**
@ -853,19 +851,19 @@ public class WmsHqlPack {
* @param wmsStockSn
* @return
*/
public static String packWmsStockSn(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packWmsStockSn(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
getStringBuilderPack(wmsStockSn, result);
return result.toString();
return result;
}
/**
@ -895,14 +893,14 @@ public class WmsHqlPack {
* @param tranNo
* @return
*/
public static String packWmsTransSn(String tranNo) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packWmsTransSn(String tranNo) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
HqlPack.getStringEqualPack(tranNo, "transNo", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
DdlPreparedPack.getStringEqualPack(tranNo, "transNo", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
return result;
}
/**
@ -911,19 +909,19 @@ public class WmsHqlPack {
* @param wmsTransQuan
* @return
*/
public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packWmsTransQuan(WmsTransQuan wmsTransQuan) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
getStringBuilderPack(wmsTransQuan, result);
return result.toString();
return result;
}
/**
@ -932,17 +930,17 @@ public class WmsHqlPack {
* @param wmsPackage
* @return
*/
public static String packWmsPackAge(WmsPackage wmsPackage) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packWmsPackAge(WmsPackage wmsPackage) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);
return result.toString();
return result;
}
/**
@ -1015,19 +1013,19 @@ public class WmsHqlPack {
* @param wmsMoveSn
* @return
*/
public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result);
HqlPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result);
HqlPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result);
DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result);
getStringBuilderPack(wmsMoveSn, result);
return result.toString();
return result;
}
/**
@ -1058,21 +1056,21 @@ public class WmsHqlPack {
* @param wmsQCMaster
* @return
*/
public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) {
DdlPackBean result = new DdlPackBean();
//单号
HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
//业务类型
HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
//关联单据类型
HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
//关联单据号
HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
getStringBuilderPack(wmsQCMaster, result);
return result.toString();
return result;
}
/**
@ -1101,18 +1099,18 @@ public class WmsHqlPack {
* @param wmsStockSn
* @return
*/
public static String packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
//查询参数封装
HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "",
DdlPreparedPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "",
WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result);
//单号
HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
getStringBuilderPack(wmsStockSn, result);
return result.toString();
return result;
}
/**
@ -1121,15 +1119,15 @@ public class WmsHqlPack {
* @param wmsQCDetails
* @return
*/
public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) {
DdlPackBean result = new DdlPackBean();
//单号
HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result);
getStringBuilderPack(wmsQCDetails, result);
return result.toString();
return result;
}
/**
@ -1138,16 +1136,16 @@ public class WmsHqlPack {
* @param wmsQCTrans
* @return
*/
public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
DdlPackBean result = new DdlPackBean();
//单号
HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
//物料
HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result);
getStringBuilderPack(wmsQCTrans, result);
return result.toString();
return result;
}
/**
@ -1390,20 +1388,20 @@ public class WmsHqlPack {
* @param wmsStockSn
* @return
*/
public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
getStringBuilderPack(wmsStockSn, result);
return result.toString();
return result;
}
/**
@ -1412,15 +1410,15 @@ public class WmsHqlPack {
* @param wmsSnPrintRcd
* @return
*/
public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result);
public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result);
getStringBuilderPack(wmsSnPrintRcd, result);
return result.toString();
return result;
}
/**
@ -1429,12 +1427,12 @@ public class WmsHqlPack {
* @param wmsStockSn
* @return
*/
public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
return result.toString();
public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
return result;
}
/**
@ -1443,12 +1441,12 @@ public class WmsHqlPack {
* @param wmsStockQuan
* @return
*/
public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
public static DdlPackBean packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
getStringBuilderPack(wmsStockQuan, result);
return result.toString();
return result;
}
/**

Loading…
Cancel
Save