sweb同一供应商编码命名为VendorNo

yun-zuoyi
钮海涛 4 years ago
parent 9b57f47af6
commit b5c994a18b

@ -32,8 +32,8 @@ public class SwebDocMovementDetails extends BaseBean {
private static final long serialVersionUID = -1232334350341792942L; private static final long serialVersionUID = -1232334350341792942L;
@ApiParam("供应商编号") @ApiParam("供应商编号")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")

@ -92,8 +92,8 @@ public class SwebDocMovementMaster extends BaseBean {
private String refNo; private String refNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")

@ -75,10 +75,6 @@ public class SwebDocMovementSn extends BaseBean {
@ApiParam(value = "条码类型") @ApiParam(value = "条码类型")
private Integer snType; private Integer snType;
@ApiParam("供应商编号")
@Column(name = "VENDOR_CODE")
private String vendorCode;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")
private String vendorName; private String vendorName;

@ -42,8 +42,8 @@ public class SwebProcurementPlanOrder extends BaseBean {
private Integer orderStatus; private Integer orderStatus;
@ApiParam("供应商代码") @ApiParam("供应商代码")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")

@ -37,8 +37,8 @@ public class SwebPurchaseOrder extends BaseBean {
public String orderNo; public String orderNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")

@ -36,8 +36,8 @@ public class SwebPurchaseOrderDetails extends BaseBean {
private String orderNo; private String orderNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")

@ -36,8 +36,8 @@ public class SwebPurchaseOrderSn extends BaseBean {
private String orderNo; private String orderNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")

@ -37,9 +37,9 @@ public class SwebRequireAlarm extends BaseBean {
@ApiParam("物料名称") @ApiParam("物料名称")
private String partName; private String partName;
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
@ApiParam("供应商代码") @ApiParam("供应商代码")
private String vendorCode; private String vendorNo;
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")
@ApiParam("供应商名称") @ApiParam("供应商名称")

@ -35,9 +35,9 @@ public class SwebVendorAlarm extends BaseBean {
@ApiParam("物料名称") @ApiParam("物料名称")
private String partName; private String partName;
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
@ApiParam("供应商代码") @ApiParam("供应商代码")
private String vendorCode; private String vendorNo;
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")
@ApiParam("供应商名称") @ApiParam("供应商名称")

@ -38,6 +38,6 @@ public class SwebVendorRel extends BaseBean {
private String vendorName; private String vendorName;
@ApiParam("供应商代码") @ApiParam("供应商代码")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
} }

@ -37,9 +37,9 @@ public class SwebVendorStock extends BaseBean {
@ApiParam("物料名称") @ApiParam("物料名称")
private String partName; private String partName;
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
@ApiParam("供应商代码") @ApiParam("供应商代码")
private String vendorCode; private String vendorNo;
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")
@ApiParam("供应商名称") @ApiParam("供应商名称")

@ -30,9 +30,9 @@ import javax.persistence.Transient;
public class SwebVendorSupplierCapcity extends BaseBean { public class SwebVendorSupplierCapcity extends BaseBean {
private static final long serialVersionUID = 2327910806789997252L; private static final long serialVersionUID = 2327910806789997252L;
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
@ApiParam("供应商代码") @ApiParam("供应商代码")
private String vendorCode; private String vendorNo;
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")
@ApiParam("供应商名称") @ApiParam("供应商名称")

@ -1,48 +0,0 @@
package cn.estsh.i3plus.pojo.sweb.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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 : jason.niu
* @CreateDate : 2020-05-28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_MOVEMENT_TO_SWEB")
@Api("库存移动单处理成功后的记录")
public class WmsMovementToSweb extends BaseBean {
private static final long serialVersionUID = 49215041475324487L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
/**
* :1=,10=,20=
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer itemStatus;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
}

@ -23,7 +23,7 @@ public class SwebPOBatchInsertEnterModel extends BaseBean {
private String orderNo; private String orderNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
private String vendorName; private String vendorName;

@ -24,7 +24,7 @@ public class SwebPOBatchInsertItemEnterModel implements Serializable {
private String partName; private String partName;
@ApiParam("供应商编号") @ApiParam("供应商编号")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
private String vendorName; private String vendorName;

@ -21,7 +21,7 @@ public class SwebPODetailsUpdateHistoryModel extends BaseBean {
private String orderNo; private String orderNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
private String vendorCode; private String vendorNo;
@ApiParam(value = "零件号") @ApiParam(value = "零件号")
private String partNo; private String partNo;

@ -19,7 +19,7 @@ public class SwebPOForPubListEnterModel extends BaseBean {
private String orderNo; private String orderNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
private String vendorCode; private String vendorNo;
@ApiParam(value = "订单类型", example = "1") @ApiParam(value = "订单类型", example = "1")
public Integer orderType; public Integer orderType;

@ -28,8 +28,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
private String partNo; private String partNo;
@ApiParam("供应商编号") @ApiParam("供应商编号")
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
private String vendorCode; private String vendorNo;
@ApiParam("供应商名称") @ApiParam("供应商名称")
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")

@ -1,9 +0,0 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb;
import org.springframework.stereotype.Repository;
@Repository
public interface WmsMovementToSwebRepository extends BaseRepository<WmsMovementToSweb, Long> {
}

@ -52,7 +52,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
@ -67,10 +67,10 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { if (StringUtil.isEmpty(purchaseOrder.getVendorNo())) {
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
} else { } else {
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorNo(), "vendorNo", result);
} }
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
@ -113,7 +113,7 @@ public class SwebHqlPack {
HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result); HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result);
HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); HqlPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result);
HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result); HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result);
HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result); HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result);
// 封装有效状态和删除状态 // 封装有效状态和删除状态
@ -127,7 +127,7 @@ public class SwebHqlPack {
public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
// 封装有效状态和删除状态 // 封装有效状态和删除状态
@ -139,7 +139,7 @@ public class SwebHqlPack {
public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(swebProcurementPlanOrder, result); return buildHql(swebProcurementPlanOrder, result);
@ -156,7 +156,7 @@ public class SwebHqlPack {
public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) { public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorRel.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(vendorRel, result); return buildHql(vendorRel, result);
@ -165,19 +165,17 @@ public class SwebHqlPack {
public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) { public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
return buildHql(details, result); return buildHql(details, result);
} }
public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
return buildHql(details, result); return buildHql(details, result);
} }
@ -189,9 +187,7 @@ public class SwebHqlPack {
public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) { public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
return buildHql(details, result); return buildHql(details, result);
} }
@ -212,17 +208,17 @@ public class SwebHqlPack {
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringLikerPack(details.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(details, result); return buildHql(details, result);
} }
public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorCodes) { public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorNos) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
if (vendorCodes.size() == 1) { if (vendorNos.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
} else if (vendorCodes.size() > 1){ } else if (vendorNos.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
} }
DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result);
@ -236,12 +232,12 @@ public class SwebHqlPack {
return buildHql(capcity, result); return buildHql(capcity, result);
} }
public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorCodes) { public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorNos) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
if (vendorCodes.size() == 1) { if (vendorNos.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
} else if (vendorCodes.size() > 1){ } else if (vendorNos.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
} }
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
if (!StringUtil.isEmpty(alarm.getDateStart())) { if (!StringUtil.isEmpty(alarm.getDateStart())) {
@ -254,24 +250,24 @@ public class SwebHqlPack {
return buildHql(alarm, result); return buildHql(alarm, result);
} }
public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorCodes) { public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorNos) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
if (vendorCodes.size() == 1) { if (vendorNos.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
} else if (vendorCodes.size() > 1){ } else if (vendorNos.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
} }
DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
return buildHql(stock, result); return buildHql(stock, result);
} }
public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorCodes) { public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorNos) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
if (vendorCodes.size() == 1) { if (vendorNos.size() == 1) {
DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
} else if (vendorCodes.size() > 1){ } else if (vendorNos.size() > 1){
DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
} }
DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);

@ -41,12 +41,12 @@ public class SwebProcurementPlanOrder extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo; private String orderNo;
@Column(name = "VENDOR_CODE") @Column(name = "VENDOR_NO")
@ApiParam(value = "供应商代码") @ApiParam(value = "供应商代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor",
searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo")
private String vendorCode; private String vendorNo;
@Column(name = "VENDOR_NAME") @Column(name = "VENDOR_NAME")
@ApiParam(value = "供应商名称") @ApiParam(value = "供应商名称")

@ -176,7 +176,7 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", packBean);
DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);

Loading…
Cancel
Save