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

修改供应商端登录及供应商端代码重构

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 8346aa3fae
commit 63a06fcc27
8 changed files with 9 additions and 396 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,99 +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.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-05-28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "SWEB_MOVEMENT_TO_WMS")
@Api("库存移动单处理成功后的记录")
public class SwebMovementToWms extends BaseBean {
private static final long serialVersionUID = -8089219927352225317L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name = "ITEM")
@ApiParam("行号")
public String item;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
/**
* 移动类型:IN=入库,OUT=出库,MOVE=移库
*/
@Column(name = "MOVE_TYPE")
@ApiParam("移动类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
public Integer moveType;
/**
* 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
* VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
* MI=移库入库,MO=移库出库,SO=发运
*/
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
public Integer busiType;
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer itemStatus;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
}

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

@ -1,118 +0,0 @@
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;
}

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

@ -1,97 +0,0 @@
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-05-28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "SWEB_PO_TO_WMS")
@Api("库存移动单处理成功后的记录")
public class SwebPoToWms extends BaseBean {
private static final long serialVersionUID = -3999194389200855165L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name = "VERSION")
@ApiParam("版本")
public String version;
@Column(name = "ITEM")
@ApiParam("行号")
private Integer item;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
private Double qty;
@Column(name = "VENDOR_NO")
@ApiParam("供应商")
private String vendorNo;
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
private Double printQty;
@Column(name = "UNIT")
@ApiParam("单位")
private String unit;
@Column(name = "PLAN_DATE")
@ApiParam("计划交货日期")
private String planDate;
@Column(name = "PLAN_TIME")
@ApiParam("计划交货时间")
private String planTime;
@Column(name = "ERP_AREA_NO")
@ApiParam("默认收货库存地")
private String erpAreaNo;
@Column(name = "SNP", columnDefinition = "decimal(18,8)")
@ApiParam("标准包装")
private Double snp;
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer itemStatus;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
}

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

@ -1,46 +0,0 @@
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.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_PO_TO_SWEB")
@Api("库存移动单处理成功后的记录")
public class WmsPoToSweb extends BaseBean {
private static final long serialVersionUID = 4710841067412420270L;
@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;
}

9
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java
Unescape Escape View File

@ -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.SwebMovementToWms;
import org.springframework.stereotype.Repository;
@Repository
public interface SwebMovementToWmsRepository extends BaseRepository<SwebMovementToWms, Long> {
}

9
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java
Unescape Escape View File

@ -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.SwebPoToWms;
import org.springframework.stereotype.Repository;
@Repository
public interface SwebPoToWmsRepository extends BaseRepository<SwebPoToWms, Long> {
}

9
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java
Unescape Escape View File

@ -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.WmsPoToSweb;
import org.springframework.stereotype.Repository;
@Repository
public interface WmsPoToSwebRepository extends BaseRepository<WmsPoToSweb, Long> {
}

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

@ -30,7 +30,7 @@ public class SwebHqlPack {
* @param hqlStr
* @return
*/
private static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) {
public static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) {
// 判断工厂代码是否为空
if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
@ -212,14 +212,14 @@ public class SwebHqlPack {
return buildHql(details, result);
}
public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(master, result);
}
// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
// DdlPackBean result = new DdlPackBean();
// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result);
// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
// return buildHql(master, result);
// }
public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
DdlPackBean result = new DdlPackBean();

Write Preview
Loading…
Cancel
Save