Finish Task #1813 Cost:32h

Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
yun-zuoyi
qianhs 5 years ago
parent 47131ff13f
commit b474ef1266

@ -6971,6 +6971,154 @@ public class WmsEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum APPROVAL_STATUS {
APPROVE_PROCESSING(10, "APPROVE_PROCESSING", "审批中"),
APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "已审批"),
APPROVE_REFUSE(30, "APPROVE_REFUSE", "审批拒绝");
private int value;
private String code;
private String description;
APPROVAL_STATUS(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 String getCode() {
return code;
}
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 String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 APPROVAL_STATUS codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NORMAL_ABNORMAL {
NORMAL(10, "NORMAL", "正常"),
ABNORMAL(20, "ABNORMAL", "非正常");
private int value;
private String code;
private String description;
NORMAL_ABNORMAL(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 String getCode() {
return code;
}
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 String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 NORMAL_ABNORMAL codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -210,6 +212,41 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam("物料编号组")
public String[] partNos;
@ApiParam("是否正常运输")
@Column(name = "IS_NORMAL_TRANSPORTATION")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
private Integer isNormalTransportation;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
private Integer transportType;
@Column(name = "LOGISTICS_VENDOR_NO")
@ApiParam("物流供应商")
private String logisticsVendorNo;
//正常运输 和非正常运输
@Column(name = "BUSINESS_TYPE")
@ApiParam(value = "业务类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer businessType;
@Column(name = "IS_TRANSPORTATION_CREATION")
@ApiParam(value = "运输信息创建")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
private Integer isTransportationCreation;
@Column(name = "IS_GOOD_PRODUCT")
@ApiParam(value = "运输信息创建")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
private Integer isGoodProduct;
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}

@ -0,0 +1,89 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-05-15 3:18
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用记录")
public class WmsLogisticExpenseRecords extends BaseBean {
private static final long serialVersionUID = 6512855224667052310L;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "工厂名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String organizeName;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Column(name = "SHIPPING_FLAG")
@ApiParam(value = "发往地")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String shippingFlag;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
public Integer busiType;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
private Integer transportType;
@Column(name = "sum")
@ApiParam(value = "总运输费用")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Double sum;
@Column(name = "LOGISTICS_VENDOR_NO")
@ApiParam(value = "物流供应商")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String logisticsVendorNo;
@Transient
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class)
public Integer orderStatus;
public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) {
// this.organizeName = docMovementMaster.getorganizeName;
this.orderNo = docMovementMaster.getOrderNo();
this.shippingFlag = docMovementMaster.getFlagNo();
this.busiType = docMovementMaster.getBusiType();
this.transportType = docMovementMaster.getTransportType();
this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
}
public WmsLogisticExpenseRecords() {
}
}

@ -0,0 +1,81 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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 :QianHuaSheng
* @CreateDate : 2020-05-15 3:18
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_LOGISTIC_EXPENSE_RECORDS_DETAILS")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用记录明细")
public class WmsLogisticExpenseRecordsDetails extends BaseBean {
private static final long serialVersionUID = -6839107270239441520L;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "工厂名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String organizeName;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "unit")
@ApiParam(value = "计量单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
isRequire = 2, dataSrc = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String unit;
@Column(name = "QTY")
@ApiParam(value = "数量")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Double qty;
@Column(name = "COST")
@ApiParam(value = "总运输费用")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Double cost;
@Column(name = "START_TIME")
@ApiParam(value = "开始时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String startTime;
@Column(name = "END_TIME")
@ApiParam(value = "结束时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String endTime;
}

@ -29,7 +29,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用管理", description = "物流费用管理")
@Api(value = "物流费用管理")
public class WmsLogisticsCosts extends BaseBean {
private static final long serialVersionUID = -5307311210847854654L;
@ -59,9 +59,9 @@ public class WmsLogisticsCosts extends BaseBean {
private String salesUnit;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@ApiParam(value = "运输类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer transportType;
@Column(name = "price")
@ -78,4 +78,5 @@ public class WmsLogisticsCosts extends BaseBean {
@ApiParam(value = "结束日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String endDate;
}

@ -0,0 +1,125 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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 :QianHuaSheng
* @CreateDate : 2020-05-14 11:41
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_LOGISTICS_FREIGHT_APPROVAL")
@Api("物流运费审批")
public class WmsLogisticsFreightApproval extends BaseBean {
private static final long serialVersionUID = -1385266737512278984L;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String orderNo;
@Column(name = "BUSI_TYPE")
@ApiParam("单据类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "OUT_MOVEMENT_BUSI_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class)
private Integer busiType;
@Column(name = "APPROVAL_STATUS")
@ApiParam("审批状态")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "APPROVAL_STATUS")
@AnnoOutputColumn(refClass = WmsEnumUtil.APPROVAL_STATUS.class)
private Integer approvalStatus;
@Column(name = "SUPPLY_WAREHOUSE")
@ApiParam("供货仓库")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String supplyWarehouse;
@Column(name = "DEMAND_WAREHOUSE")
@ApiParam("需求仓库")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String demandWarehouse;
@Column(name = "CUST_NO")
@ApiParam("客户代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custNo;
@Column(name = "LOGISTICS_VENDOR_NO")
@ApiParam("物流供应商")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String logisticsVendorNo;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
private Integer transportType;
@Column(name = "PLACE_OF_ORIGIN_CODE")
@ApiParam(value = "客户发出地代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String placeOfOriginCode;
@Column(name = "PLACE_OF_ORIGIN_DESC")
@ApiParam(value = "客户发出地描述")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String placeOfOriginDesc;
@Column(name = "CUST_DELIVERY_CODE")
@ApiParam(value = "客户发往地代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custDeliveryCode;
@Column(name = "CUST_DELIVERY_DESC")
@ApiParam(value = "客户发往地描述")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String custDeliveryDesc;
@Column(name = "is_urgent")
@ApiParam(value = "是否紧急")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private Integer isUrgent;
public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
this.orderNo = docMovementMaster.getOrderNo();
this.busiType = docMovementMaster.getBusiType();
this.organizeCode = docMovementMaster.getOrganizeCode();
this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue();
this.supplyWarehouse = docMovementMaster.getAssignSrcWhNo();
this.demandWarehouse = docMovementMaster.getAssignDestWhNo();
this.custNo = docMovementMaster.getCustNo();
this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo();
this.transportType = docMovementMaster.getTransportType();
this.placeOfOriginCode = docMovementMaster.getFlagNo();
// this.placeOfOriginDesc = placeOfOriginDesc;
this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo();
// this.custDeliveryDesc = custDeliveryDesc;
this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
}
public WmsLogisticsFreightApproval() {
}
}

@ -29,7 +29,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "物流费用管理", description = "物流费用管理")
@Api(value = "物流费用管理")
public class WmsShortLogisticsCosts extends BaseBean {
private static final long serialVersionUID = 733863151632950809L;
@ -64,9 +64,9 @@ public class WmsShortLogisticsCosts extends BaseBean {
private String logisticsVendorNo;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
@ApiParam(value = "运输类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer transportType;
@Column(name = "SALES_UNIT")

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticExpenseRecordsDetails;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-06-28 15:17
* @Modify:
**/
@Repository
public interface WmsLogisticExpenseRecordsDetailsRepository extends BaseRepository<WmsLogisticExpenseRecordsDetails, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticExpenseRecords;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-06-28 15:17
* @Modify:
**/
@Repository
public interface WmsLogisticExpenseRecordsRepository extends BaseRepository<WmsLogisticExpenseRecords, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticsFreightApproval;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2020-05-14 15:17
* @Modify:
**/
@Repository
public interface WmsLogisticsFreightApprovalRepository extends BaseRepository<WmsLogisticsFreightApproval, Long> {
}

@ -3321,6 +3321,39 @@ public class WmsHqlPack {
return result;
}
/**
*
*
* @param logisticExpenseRecordsDetails
* @return
*/
public static DdlPackBean packHqlLogisticExpenseRecordsDetails(WmsLogisticExpenseRecordsDetails logisticExpenseRecordsDetails) {
DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecordsDetails.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(logisticExpenseRecordsDetails.getPartName(), "partName", result);
DdlPreparedPack.getStringEqualPack(logisticExpenseRecordsDetails.getOrderNo(), "orderNo", result);
getStringBuilderPack(logisticExpenseRecordsDetails, result);
return result;
}
/**
*
*
* @param logisticExpenseRecords
* @return
*/
public static DdlPackBean packHqlLogisticExpenseRecords(WmsLogisticExpenseRecords logisticExpenseRecords) {
DdlPackBean result = WmsHqlPack.packHqlWms(logisticExpenseRecords.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getLogisticsVendorNo(), "logisticsVendorNo", result);
DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getTransportType(), "transportType", result);
DdlPreparedPack.getNumEqualPack(logisticExpenseRecords.getBusiType(), "busiType", result);
DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(logisticExpenseRecords.getOrderNo(), "orderNo", result);
getStringBuilderPack(logisticExpenseRecords, result);
return result;
}
/**
*

Loading…
Cancel
Save