修复平台登录问题

yun-zuoyi
钮海涛 5 years ago
parent d0eea0eb9a
commit 3a40d278ac

@ -531,4 +531,119 @@ public class SwebEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_BUSI_TYPE {
PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"),
CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"),
OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"),
ALLOCATION(40, "ALLOCATION", "调拨"),
SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR
CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
ASN(200, "ASN", "ASN"),
PO(210, "PO", "PO"),
QC(220, "QC", "QC"),
AMPR(230, "AMPR", "AMPR"),
FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
VDA_QC(290, "VDA_QC", "VDA质检"),
VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
KT_SCRAP(330, "KT_SCRAP", "KT报废"),
KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
KT_RETURN(370, "KT_RETURN", "KT退货"),
KT_REWORK(380, "KT_REWORK", "KT返工"),
KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
KT_SORTING(400, "KT_SORTING", "KT分选"),
VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单");
private int value;
private String code;
private String description;
OUT_MOVEMENT_BUSI_TYPE(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 codeOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
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 String valueOfDescription(int val) {
return valueOf(val);
}
}
}

@ -142,4 +142,8 @@ public class SwebDocMovementMaster extends BaseBean {
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
private String srcZoneNo;
@Column(name = "SHIP_TIME")
@ApiParam(value = "发运时间")
private String shipTime;
}

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

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

@ -68,9 +68,9 @@ public class SwebPurchaseOrderSn extends BaseBean {
@ApiParam(value = "序列号")
private String serialNo;
@Column(name = "BAR_CODE")
@Column(name = "SN")
@ApiParam(value = "箱条码")
private String barCode;
private String sn;
@Column(name = "ERP_WAREHOUSE")
@ApiParam("库存地")

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

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

@ -61,4 +61,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
@Transient
@ApiParam(value = "是否可编辑(前端使用)")
public boolean isSet = false;
@Transient
@ApiParam(value = "预计到货日期")
public String expectedTime;
}

@ -0,0 +1,9 @@
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> {
}

@ -0,0 +1,9 @@
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> {
}

@ -0,0 +1,9 @@
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> {
}

@ -0,0 +1,9 @@
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> {
}

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.sweb.bean.*;
import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
import org.apache.commons.lang3.StringUtils;
@ -48,8 +49,10 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
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.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(purchaseOrder, result);
@ -183,6 +186,8 @@ public class SwebHqlPack {
public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(details, result);

Loading…
Cancel
Save