I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sweb功能开发

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 9a959a5184
commit 54b0af00cc
5 changed files with 199 additions and 8 deletions
Show Stats Download Patch File Download Diff File

57
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java
Unescape Escape View File

@ -136,6 +136,63 @@ public class SwebEnumUtil {
}
/**
* PO订单来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SOURCE {
WMS(10, "WMS", "WMS"),
SWEB(20, "SWEB", "SWEB");
private int value;
private String code;
private String description;
ORDER_SOURCE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 包装类型枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

118
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java
Unescape Escape View File

@ -0,0 +1,118 @@
package cn.estsh.i3plus.pojo.sweb.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.ColumnDefault;
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-06-10
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "SWEB_PO_SN_TO_WMS")
@Api("库存移动单处理成功后的记录")
public class SwebPoSnToWms extends BaseBean {
private static final long serialVersionUID = 746409789382994374L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@ApiParam("供应商编号")
@Column(name = "VENDOR_CODE")
private String vendorCode;
@ApiParam("供应商名称")
@Column(name = "VENDOR_NAME")
private String vendorName;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "零件名称")
private String partName;
@ApiParam("零件类型")
@Column(name = "PART_TYPE")
private Integer partType;
@ApiParam(value = "单位")
@Column(name = "UNIT")
private String unit;
@Column(name = "BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "箱数", example = "0")
private Integer boxQty;
@Column(name = "SERIAL_NO")
@ApiParam(value = "序列号")
private String serialNo;
@Column(name = "SN")
@ApiParam(value = "箱条码")
private String sn;
@Column(name = "ERP_WAREHOUSE")
@ApiParam("库存地")
private String erpWarehouse;
@Column(name = "PRODUCTION_TIME")
@ApiParam(value = "产生时间")
private String productionTime;
@Column(name = "PRINT_TIME")
@ApiParam(value = "打印时间")
private String printTime;
@Column(name = "PRINTS")
@ApiParam("打印次数")
private Integer prints;
@Column(name = "CHECK_CODE")
@ApiParam(value = "检验编号")
private String checkCode;
@Column(name = "STOVE_NO")
@ApiParam(value = "特殊批号")
private String stoveNo;
@Column(name = "BATCH_NO")
@ApiParam(value = "批次号")
private String batchNo;
@ApiParam("是否同步")
@Column(name = "IS_SYN")
private String isSyn;
@Column(name = "REC_TIME")
@ApiParam(value = "收货时间")
private String recTime;
@Column(name = "PACKAGE_NO")
@ApiParam(value = "包装编号")
private String packageNo;
@ColumnDefault("0")
@Column(name = "WEIGHT")
@ApiParam(value = "重量")
private Double weight;
}

5
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
Unescape Escape View File

@ -104,6 +104,11 @@ public class SwebPurchaseOrder extends BaseBean {
@ApiParam(value = "合同号")
private String refNo;
// SwebEnumUtil.ORDER_SOURCE
@Column(name = "ORDER_SOURCE")
@ApiParam(value = "订单来源")
private Integer orderSource;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "预计到货时间 开始时间")

5
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
Unescape Escape View File

@ -55,9 +55,9 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam(value = "零件名称")
private String partName;
@ApiParam(value = "订单类型", example = "1")
/*@ApiParam(value = "订单类型", example = "1")
@Column(name = "ORDER_TYPE")
public Integer orderType;
public Integer orderType;*/
@ApiParam("零件类型")
@Column(name = "PART_TYPE")
@ -105,6 +105,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam("库存地")
private String erpWarehouse;
// 停用
@Column(name = "REF_QTY")
@ColumnDefault("0")
@ApiParam(value = "订单数量", example = "0")

20
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.sweb.bean.*;
import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
/**
* @Description : hql 封装
* @Reference :
@ -45,15 +47,21 @@ public class SwebHqlPack {
return hqlStr;
}
public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
public static DdlPackBean getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder, List<String> vendorNos) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
} else {
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
}
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
}
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getPoStatus(), "poStatus", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(purchaseOrder, result);
}
@ -118,6 +126,8 @@ public class SwebHqlPack {
public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getPartName(), "partName", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(swebProcurementPlanOrderDetails, result);
}
@ -136,7 +146,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
return buildHql(details, result);
}
@ -145,7 +155,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
return buildHql(details, result);
}
@ -158,7 +168,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
//DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
return buildHql(details, result);
}

Write Preview
Loading…
Cancel
Save