Merge branch 'test' into dev

yun-zuoyi
钮海涛 5 years ago
commit 7982cefc1e

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -876,7 +876,8 @@ public class BlockSoftSwitchEnumUtil {
SUIT_MESSAGE(10, "适配信息"),
REQUEST_ORGIN_PARAM(20, "请求原始参数"),
ORIGINAL_MESSAGE(30, "原始报文"),
CONVERTED_MESSAGE(40, "转换报文");
CONVERTED_MESSAGE(40, "转换报文"),
SUIT_SEND_MESSAGE(50, "适配发送报文");
private int value;
private String description;

@ -5742,16 +5742,18 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLC_DATA_TYPE {
INT("int", "数字"),
STRING("string", "字符串"),
BOOLEAN("boolean", "布尔");
STRING("10", "String", "字符串"),
BOOLEAN("20","Boolean", "布尔"),
WORD("30", "Word", "整形-Word"),
DWORD("40","Dword", "整形-DWord");
private String value;
private String code;
private String description;
PLC_DATA_TYPE(String value, String description) {
PLC_DATA_TYPE(String value, String code,String description) {
this.value = value;
this.code = code;
this.description = description;
}

@ -589,7 +589,8 @@ public class SwebEnumUtil {
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单");
LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
private int value;
private String code;
private String description;
@ -646,4 +647,57 @@ public class SwebEnumUtil {
return valueOf(val);
}
}
/**
* PO/DOC_MOVE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SN_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
PRINTED(40, "C", "已打印");
private int value;
private String code;
private String description;
ORDER_SN_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 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;
}
}
}

@ -725,7 +725,8 @@ public class WmsEnumUtil {
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单");
LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
private int value;
private String code;
private String description;
@ -7472,4 +7473,166 @@ public class WmsEnumUtil {
return null;
}
}
/**
* BH
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_SUMMARY_IS_SYNC {
INIT(10, "INIT", "初始化"),
WAIT_SYNC(20, "WAIT_SYNC", "待同步"),
FINISH_SYNC(30, "FINISH_SYNC", "已同步");
private int value;
private String code;
private String description;
BH_SUMMARY_IS_SYNC(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 BH_SUMMARY_IS_SYNC 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 SCAN_CATEGORY {
ASN(10, "wmsDoMovementMasterRepository", "ASN"),
PO(20, "wmsDoMovementMasterRepository", "PO"),
SO(30, "wmsDoMovementMasterRepository", "SO"),
MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
QC(70, "wmsDoMovementMasterRepository", "质检单"),
CS(80, "wmsCSOrderMasterRepository", "盘点单"),
SN(90, "wmsStockSnRepository", "条码"),
PO_SN(100, "wmsPoSnRepository", "收货条码");
private int value;
private String code;
private String description;
SCAN_CATEGORY(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 SCAN_CATEGORY getByDesc(String desc) {
SCAN_CATEGORY tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i];
}
}
return tmp;
}
public static SCAN_CATEGORY 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;
}
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean implements Serializable {
@ApiParam("检测类型")
private Integer checkType;
@Column(name = "CUST_DELIERY_LOCATION")
@ApiParam("客户发运地")
private String custDelieryLocation;
}

@ -88,6 +88,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("是否允许让步")
private Integer isConcession = 0;
@Column(name = "NUMBER_FLAG")
@ApiParam("数量标识")
private String numberFlag;
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;

@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("发运时间")
private String deliveryDate;
@Column(name = "CUST_DELIERY_LOCATION")
@ApiParam("客户发运地")
private String custDelieryLocation;
@ApiParam(value = "检测结果")
@Transient
private String reulstStatus;

@ -82,7 +82,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam(value = "已完成数量")
@Transient
private Integer finishQty;
private Integer finishQty = 0;
@ApiParam(value = "检测项类型名称")
@Transient

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.mes.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;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/6/7 15:20
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SUB_PART")
@Api("数据同步死信")
public class MesSubPart extends BaseBean implements Serializable {
private static final long serialVersionUID = 4636507477301700549L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "SUB_PART_NO")
@ApiParam("替代料")
private String subPartNo;
}

@ -99,7 +99,7 @@ public class MesInterfaceDataMapper extends BaseBean {
/**
*
* SAP2WMS, WMS2SAP, MES2WMS
* SAP2WMS, WMS2SAP, MES2WMS,WMS2MES
*/
@Column(name = "GROUP_NAME")
public String groupName;

@ -54,4 +54,39 @@ public class ProductInfoManageModel {
@ApiParam("切换时间")
private String switchTime;
@ApiParam("工厂")
private String organizeCode;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("工位")
private String workCellCode;
@ApiParam("队列类型")
private Integer queueType;
@ApiParam("工单类型")
private String workType;
@ApiParam("待生产序列")
private Integer prodNum;
@ApiParam("主队列序列")
private Double queueSeq;
@ApiParam("明细队列序列")
private Double queDetailSeq;
public ProductInfoManageModel() {
}
public ProductInfoManageModel(String vinCode, String prodCfgTypeCode, String gradeCode, String produceColor, Double queDetailSeq) {
this.vinCode = vinCode;
this.prodCfgTypeCode = prodCfgTypeCode;
this.gradeCode = gradeCode;
this.produceColor = produceColor;
this.queDetailSeq = queDetailSeq;
}
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesSubPart;
import org.springframework.stereotype.Repository;
/**
* @author Wynne.Lu
* @date 2020/6/7 15:23
* @desc
*/
@Repository
public interface MesSubPartRepository extends BaseRepository<MesSubPart, Long> {
}

@ -91,7 +91,7 @@ public class MesPcnHqlPack {
* @param mesLabelTemplate
* @return
*/
public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
return packBean;
@ -116,20 +116,20 @@ public class MesPcnHqlPack {
* BOM
*
* @param stationBom
* @param rawPartSn
* @param rawPartNo
* @return
*/
public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) {
public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean);
return packBean;
}
public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) {
public static DdlPackBean getStationBom(String org, String workCenter, String workCell, String partNo) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean);
@ -183,7 +183,7 @@ public class MesPcnHqlPack {
}
// 工单管理,查询下达,启动,暂停状态
if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){
if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())) {
DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean);
}
@ -319,6 +319,7 @@ public class MesPcnHqlPack {
/**
*
*
* @param mesProduceSn
* @return
*/
@ -358,6 +359,7 @@ public class MesPcnHqlPack {
/**
*
*
* @param mesPackage
* @return
*/
@ -420,9 +422,9 @@ public class MesPcnHqlPack {
}
/**
*
*
* @param typeCfg
* @return
*/
@ -454,8 +456,8 @@ public class MesPcnHqlPack {
DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean);
DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean);
if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){
DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean);
if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) {
DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean);
}
return packBean;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -56,6 +56,12 @@ public class SuitClientModel implements Serializable {
private String suitMessage;
/**
*
*/
@XStreamCDATA
private String suitSendMessage;
/**
*
*/
private Integer requestSource;

@ -62,6 +62,9 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "关联单据类型")
public String refType;
@ApiParam(value = "erp单号")
public String erpSrcNo;
public WmsTaskInfoModel() {
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -9,6 +11,7 @@ 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;
@ -41,15 +44,21 @@ public class BsSuitCaseDataSourceTable extends BaseBean {
@Column(name = "OPERATE_TYPE_ID")
@ApiParam(value = "操作类型")
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.class)
private Integer operateTypeId;
public int getOperateTypeIdVal(){
if(operateTypeId == null){
public int getOperateTypeIdVal() {
if (operateTypeId == null) {
return -1;
}
return operateTypeId.intValue();
}
public String getOperateTypeIdTxt() {
return operateTypeId == null ? "无" : BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.valueOfDescription(operateTypeId);
}
@Column(name = "EXECUTE_SQL")
@ApiParam(value = "执行sql")
private String executeSql;
@ -62,8 +71,8 @@ public class BsSuitCaseDataSourceTable extends BaseBean {
@ApiParam(value = "是否有返回")
private Integer isReturn;
public int getIsReturnVal(){
if(isReturn == null){
public int getIsReturnVal() {
if (isReturn == null) {
return -1;
}
return isReturn.intValue();

@ -46,12 +46,20 @@ public class BsSuitCaseREST extends BaseBean {
@AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class)
private Integer requestMethodId;
public String getRequestMethodIdTxt(){
return requestMethodId == null ? "无" : CommonEnumUtil.HTTP_METHOD_TYPE.valueOfDescription(requestMethodId);
}
//CommonEnumUtil.TRUE_OR_FALSE
@Column(name = "IS_REQUEST_BODY")
@ApiParam(value = "是否使用requestBody")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isRequestBody;
public int getIsRequestBodyVal() {
return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody;
}
@Transient
@ApiParam(value = "请求头转换")
private List<BsSuitCaseParam> requestHeaderList;

@ -120,6 +120,11 @@ public class BsSuitRecord extends BaseBean {
@ApiParam(value = "适配信息 longDataId")
private String suitMessage;
// 移动至记录数据表
@Column(name = "SUIT_SEND_MESSAGE")
@ApiParam(value = "适配发送报文")
private String suitSendMessage;
@Column(name = "PROCESS_STATE")
@ApiParam(value = "处理状态")
private Integer processState;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -132,6 +132,14 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam("是否为钢卷料")
private Integer isSteel;
@Column(name = "PLAN_DATE")
@ApiParam("计划交货日期")
private String planDate;
@Column(name = "PLAN_TIME")
@ApiParam("计划交货时间")
private String planTime;
/**
*
*/

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -118,7 +118,36 @@ public class SapDocFgSum extends BaseBean {
@Transient
public Long wdfdId;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
private String bomVersion;
@Column(name = "FG_ORDER_NO")
@ApiParam(value = "产品报工orderNo")
private String fGOrderNo;
public SapDocFgSum(){}
public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) {
this.wdfdId = wdfdId;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.unit = unit;
this.erpWorkCenter = erpWorkCenter;
this.inAreaNo = inAreaNo;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.itemUnit = itemUnit;
this.outAreaNo = outAreaNo;
this.itemQty = itemQty;
this.src = src;
this.isLock = isLock;
this.effStartTime = effStartTime;
this.bomVersion = bomVersion;
this.fGOrderNo = fGOrderNo;
}
public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {
this.wdfdId = wdfdId;

@ -113,6 +113,16 @@ public class WmsBom extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String terminalNo;
@Column(name = "SEQ_NO")
@ApiParam(value = "父位置号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String seqNo;
@Column(name = "ITEM_SEQ_NO")
@ApiParam(value = "子位置号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String itemSeqNo;
@Column(name = "BOM_TYPE")
@ApiParam(value = "BOM类型")

@ -44,7 +44,7 @@ public class WmsCsStrategy extends BaseBean implements Serializable {
@Column(name = "part_type")
@ApiParam(value = "物料分类")
@AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PART_ABC")
private String partType;
@Column(name = "STRATEGY_TYPE")

@ -104,7 +104,6 @@ public class WmsDocFgDetail extends BaseBean {
@Column(name="SID")
@ApiParam("SID")
public String sid;
/**
* :10=,20=,30=
*/
@ -150,4 +149,8 @@ public class WmsDocFgDetail extends BaseBean {
@Column(name = "BATCH_NO")
@ApiParam("批号")
private String batchNo;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
private String bomVersion;
}

@ -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;
@ -156,6 +158,11 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "任务生成数量", example = "1")
private Double taskGenerateQty;
@Column(name = "PRINT_GENERATE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已打印数量")
private Double printGenerateQty;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;
@ -184,6 +191,38 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "销售单据号")
private String soOrderNo;
@Column(name = "MEL_TYPE")
@ApiParam(value = "材料类型")
private String melType;
@Column(name = "PROJECT_NO")
@ApiParam(value = "项目号")
private String projectNo;
@Column(name = "PRODUCTION_GROUP")
@ApiParam(value = "生产小组")
private String productionGroup;
@Column(name = "CUST_PART_NO")
@ApiParam(value = "客户零件号")
private String custPartNo;
@Column(name = "MATERIAL_TYPE")
@ApiParam(value = "物料类型")
private String materialType;
@Column(name = "PART_SPEC")
@ApiParam(value = "简称")
private String partSpec;
@Column(name = "WORK_ORDER_CODE")
@ApiParam(value = "工单码")
private String workOrderCode;
@Column(name = "SEQ_NO")
@ApiParam(value = "父位置号")
private String seqNo;
@Transient
@ApiParam(value = "替代物料编码")
private String subPartNo;
@ -273,6 +312,10 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("执行")
private Integer isMakeUp;
@Transient
@ApiParam(value = "子位置号")
private String itemSeqNo;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}
@ -324,6 +367,12 @@ public class WmsDocMovementDetails extends BaseBean {
public Integer isSn;
@Column(name = "REF_SRC")
@ApiParam("关联单号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String refSrc;
public WmsDocMovementDetails () {
}

@ -188,30 +188,6 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "QAD发运单据类型")
private String erpSrcType;
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;
@Transient
@ApiParam(value = "打印时间")
private String printDate;
@Transient
@ApiParam("类型名称")
public String busiTypeName;
@Transient
@ApiParam("物料编号")
public String partNo;
@ApiParam(value = "标题")
@Transient
public String title;
@Transient
@ApiParam("物料编号组")
public String[] partNos;
@ApiParam("是否正常运输")
@Column(name = "IS_NORMAL_TRANSPORTATION")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@ -230,7 +206,7 @@ public class WmsDocMovementMaster extends BaseBean {
//正常运输 和非正常运输
@Column(name = "BUSINESS_TYPE")
@ApiParam(value = "业务类型")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer businessType;
@ -242,11 +218,36 @@ public class WmsDocMovementMaster extends BaseBean {
private Integer isTransportationCreation;
@Column(name = "IS_GOOD_PRODUCT")
@ApiParam(value = "运输信息创建")
@ApiParam(value = "是否良品")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
private Integer isGoodProduct;
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;
@Transient
@ApiParam(value = "打印时间")
private String printDate;
@Transient
@ApiParam("类型名称")
public String busiTypeName;
@Transient
@ApiParam("物料编号")
public String partNo;
@ApiParam(value = "标题")
@Transient
public String title;
@Transient
@ApiParam("物料编号组")
public String[] partNos;
public int getOrderStatusVal() {
return this.orderStatus == null ? 0 : this.orderStatus;
}

@ -78,6 +78,7 @@ public class WmsLogisticExpenseRecords extends BaseBean {
public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) {
// this.organizeName = docMovementMaster.getorganizeName;
this.orderNo = docMovementMaster.getOrderNo();
this.organizeCode = docMovementMaster.getOrganizeCode();
this.shippingFlag = docMovementMaster.getFlagNo();
this.busiType = docMovementMaster.getBusiType();
this.transportType = docMovementMaster.getTransportType();

@ -1,8 +1,10 @@
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;
@ -51,6 +53,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "PART_UNIT")
@ApiParam(value = "物料单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partUnit;
@Column(name = "unit")
@ApiParam(value = "计量单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
@ -77,5 +84,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String endTime;
/**
* :N=,C=
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
}

@ -64,7 +64,7 @@ public class WmsLogisticsCosts extends BaseBean {
private String salesUnit;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输类型")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer transportType;

@ -102,6 +102,29 @@ public class WmsLogisticsFreightApproval extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isUrgent;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String assignSrcWhNo;
@Column(name = "REMAKE")
@ApiParam("备注")
public String remake;
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String assignDestWhNo;
@Column(name = "FLAG_NO")
@ApiParam(value = "客户发往地编号")
private String flagNo;
//正常运输 和非正常运输
@Column(name = "BUSINESS_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer businessType;
public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
this.orderNo = docMovementMaster.getOrderNo();
this.organizeCode = docMovementMaster.getOrganizeCode();
@ -114,10 +137,12 @@ public class WmsLogisticsFreightApproval extends BaseBean {
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();
this.assignSrcWhNo = docMovementMaster.getAssignSrcWhNo();
this.assignDestWhNo = docMovementMaster.getAssignDestWhNo();
this.flagNo = docMovementMaster.getFlagNo();
this.businessType = docMovementMaster.getBusinessType();
}
public WmsLogisticsFreightApproval() {

@ -1,10 +1,8 @@
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;
@ -45,8 +43,17 @@ public class WmsModeTransport extends BaseBean {
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
private Integer transportType;
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE")
private String transportType;
@Column(name = "SERIAL_NUMBER")
@ApiParam(value = "序号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String serialNumber;
@Column(name = "remake")
@ApiParam(value = "说明")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String remake;
}

@ -13,7 +13,12 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
/**
* @Description :
@ -145,7 +150,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
public String destLocateNo;
/**
* :1=,10=,20=
* :10:,20:,30:,40:
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@ -176,6 +181,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String groupNo;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String bomVersion;
@ApiParam(value = "待出库数量", example = "0")
@Transient
private Long waitingCounts;

@ -233,6 +233,31 @@ public class WmsMoveMaster extends BaseBean {
this.modifyDatetime = modifyDatetime;
}
public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
String createDatetime, String createUser, String modifyUser, String modifyDatetime) {
this.orderNo = orderNo;
this.organizeCode = organizeCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.transTypeCode = transTypeCode;
this.transTypeName = transTypeName;
this.itemStatus = itemStatus;
this.unit = unit;
this.srcWhNo = srcWhNo;
this.srcZoneNo = srcZoneNo;
this.destWhNo = destWhNo;
this.destZoneNo = destZoneNo;
this.transQty = transQty;
this.rejectQty = rejectQty;
this.fixId = fixId;
this.busiTypeCode = busiTypeCode;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){
this.itemQty = itemQty;
this.transTypeCode = transTypeCode;

@ -10,7 +10,11 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
@ -191,6 +195,10 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("是否预收货")
public Integer priorRC = 2;
@Column(name = "ERP_SRC_NO")
@ApiParam(value = "ERP单号")
private String erpSrcNo;
@Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''")
@ApiParam(value = "QAD发运单据类型")

@ -56,5 +56,7 @@ public class WmsPickingMovement extends BaseBean {
@AnnoOutputColumn
private String planTime;
@ApiParam(value = "ERP单号")
@AnnoOutputColumn
private String erpSrcNo;
}

@ -69,7 +69,7 @@ public class WmsShortLogisticsCosts extends BaseBean {
private String logisticsVendorNo;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输类型")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer transportType;

@ -458,6 +458,47 @@ public class WmsStockSn extends BaseBean {
@ApiParam("挑选状态")
public Integer pickResult;
@Transient
@ApiParam("位置号-打印用")
public String positionNo;
@Transient
@ApiParam("父位置号")
public String parentPositionNo;
@Transient
@ApiParam(value = "材料类型")
private String melType;
@Transient
@ApiParam(value = "项目号")
private String projectNo;
@Transient
@ApiParam(value = "生产小组")
private String productionGroup;
@Transient
@ApiParam(value = "客户零件号")
private String custPartNo;
@Transient
@ApiParam(value = "物料类型")
private String materialType;
@Transient
@ApiParam(value = "工单码")
private String workOrderCode;
@Transient
@ApiParam(value = "ERP单号")
private String erpSrcNo;
@Transient
@ApiParam(value = "检测结果ID")
private Long summaryId;
public WmsStockSn() {
}
@ -678,7 +719,7 @@ public class WmsStockSn extends BaseBean {
}
public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo,
String partNameRdd, String workCenterCode, String createUser, String createDatetime,
String partNameRdd, Long summaryId, String workCenterCode, String createUser, String createDatetime,
String modifyUser, String modifyDatetime) {
this.organizeCode = organizeCode;
this.batchNo = batchNo;
@ -686,6 +727,7 @@ public class WmsStockSn extends BaseBean {
this.locateNo = locateNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.summaryId = summaryId;
this.workCenterCode = workCenterCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
@ -694,5 +736,63 @@ public class WmsStockSn extends BaseBean {
}
public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
String qualityDate, String custNo, String custSn, String sn2d,
String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser,
String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType,
String shippingFlag, String workCenterCode, Integer snType,
String packagePartNo, Integer useCount, Integer seqNo,
String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
String prodCfgTypeName, String custNameRdd) {
this.organizeCode = organizeCode;
this.id = id;
this.sn = sn;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.snStatus = snStatus;
this.qcStatus = qcStatus;
this.qty = qty;
this.locateNo = locateNo;
this.zoneNo = zoneNo;
this.whNo = whNo;
this.lotNo = lotNo;
this.dateCode = dateCode;
this.leftCode = leftCode;
this.fixLotNo = fixLotNo;
this.vendorNo = vendorNo;
this.vendorNameRdd = vendorNameRdd;
this.qualityDate = qualityDate;
this.custNo = custNo;
this.custSn = custSn;
this.sn2d = sn2d;
this.packageNo = packageNo;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
this.parentPositionNo = parentPositionNo;
this.pdate = pdate;
this.printed = printed;
this.refSrc = refSrc;
this.refType = refType;
this.shippingFlag = shippingFlag;
this.workCenterCode = workCenterCode;
this.snType = snType;
this.packagePartNo = packagePartNo;
this.useCount = useCount;
this.seqNo = seqNo;
this.whNameRdd = whNameRdd;
this.locateNameRdd = locateNameRdd;
this.zoneNameRdd = zoneNameRdd;
this.partTypeDesc = partTypeDesc;
this.prodCfgTypeName = prodCfgTypeName;
this.custNameRdd = custNameRdd;
this.vendorNameRdd = vendorNameRdd;
}
}

@ -79,6 +79,10 @@ public class WmsTestResultSummary extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer pickResult;
@Column(name = "IS_SYNC", nullable = false)
@ApiParam("是否同步")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description")
public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue();
@Transient
@ApiParam("BH类型")
@ -128,8 +132,6 @@ public class WmsTestResultSummary extends BaseBean {
this.bhType = bhType;
}
public WmsTestResultSummary() {
}
public WmsTestResultSummary() { }
}

@ -106,10 +106,6 @@ public class WmsTmsShippingExt extends BaseBean {
@ApiParam("物料编码")
private String partNo;
@Transient
@ApiParam("关联单号")
private String refOrderNo;
@Column(name="PATH_URL")
@ApiParam("回执单地址")
private String pathUrl;

@ -1,358 +0,0 @@
package cn.estsh.i3plus.pojo.wms.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;
import javax.persistence.Transient;
import javax.persistence.Version;
/**
* @Description :
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL")
@Api("装车单信息明细")
public class WmsTmsShippingExtDetail extends BaseBean {
private static final long serialVersionUID = -4800308354250386102L;
@Column(name="MOVE_NO")
@ApiParam("装车单")
public String moveNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "ITEM")
@ApiParam("行号")
public String item;
@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 = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
@Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@Column(name = "PLAN_DATE")
@ApiParam(value = "计划日期")
private String planDate;
@Column(name = "PLAN_TIME")
@ApiParam(value = "计划时间")
private String planTime;
@Column(name = "SRC_NO")
@ApiParam(value = "源单号")
private String srcNo;
/**
* :N=,C=
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
/**
* :0=,1=
*/
@Column(name = "IS_FREE")
@ApiParam(value = "是否免费", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isFree;
@Column(name = "REMARK")
@ApiParam(value = "操作原因")
private String remark;
@Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "REC_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;
@Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "任务生成数量", example = "1")
private Double taskGenerateQty;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
@Column(name = "LOT_NO")
@ApiParam("批次")
public String lotNo;
@Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false)
@ApiParam("源单行号")
public String srcItem;
@Column(name = "CUST_ORDER_NO")
@ApiParam("客户订单号")
public String custOrderNo;
@Column(name = "ASSIGN_DATE_CODE")
@ApiParam(value = "指定生产日期")
private String assignDateCode;
@Transient
@ApiParam("实际批次")
private String actualLot;
@Transient
@ApiParam("实际数量")
private Double actualQty;
@Transient
@ApiParam("推荐批次")
private String recommondLot;
@Transient
@ApiParam("推荐库位")
private String recommondLocateNo;
@Transient
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
@Transient
@ApiParam("生产日期")
public String dateCode;
@ApiParam(value = "散件移库输入移库数量")
@Transient
public Double inputMoveQty;
@Transient
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@Transient
@ApiParam(value = "条码总数量", example = "1")
private Double detailsSnCount;
@Transient
@ApiParam(value = "余数", example = "1")
private Double restQty;
@Transient
@ApiParam("任务状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
private Integer isTask;
@Transient
@ApiParam("主表单据状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer orderMasterStatus;
@Transient
@ApiParam("打印状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
private Integer printStatus;
@Transient
@ApiParam("优先级")
private Integer priority;
@Transient
@ApiParam(value = "汇总需求数量", example = "0")
public Double sumQty;
@Transient
@ApiParam(value = "汇总拣货数量", example = "0")
public Double sumPickQty;
@Transient
@ApiParam("执行状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description")
private Integer executeStatus;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
@Transient
@ApiParam("移动类型")
public Integer moveType;
@Transient
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
public Integer busiType;
@Column(name = "IS_SN")
@ApiParam(value = "条码生成状态", example = "20")
public Integer isSn;
public WmsTmsShippingExtDetail () {
}
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}
public Double getQty() {
return qty == null ? 0D : this.qty.doubleValue();
}
public Double getOutQty() {
return outQty == null ? 0D : this.outQty.doubleValue();
}
public Double getPickQty() {
return pickQty == null ? 0D : this.pickQty.doubleValue();
}
public Double getActualQty() {
return actualQty == null ? 0D : this.actualQty.doubleValue();
}
public Double getRecQty() {
return recQty == null ? 0D : this.recQty.doubleValue();
}
public Integer getIsTaskVal() {
return isTask == null ? 0 : this.isTask.intValue();
}
public Integer getOrderMasterStatus() {
return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
}
public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) {
this.moveNo = moveNo;
this.partNo = docMovementDetails.getPartNo();
this.partNameRdd = docMovementDetails.getPartNameRdd();
this.item = docMovementDetails.getItem();
this.qty =docMovementDetails.getQty();
this.unit = docMovementDetails.getUnit();
this.orderNo = docMovementDetails.getOrderNo();
this.srcWhNo = docMovementDetails.getSrcWhNo();
this.srcZoneNo = docMovementDetails.getSrcZoneNo();
this.srcLocateNo = docMovementDetails.getSrcLocateNo();
this.destWhNo = docMovementDetails.getDestWhNo();
this.destZoneNo = docMovementDetails.getDestZoneNo();
this.destLocateNo = docMovementDetails.getDestLocateNo();
this.printQty = docMovementDetails.getPrintQty();
this.planDate = docMovementDetails.getPlanDate();
this.planTime = docMovementDetails.getPlanTime();
this.srcNo = docMovementDetails.getSrcNo();
this.itemStatus = docMovementDetails.getItemStatus();
this.isFree = docMovementDetails.getIsFree();
this.remark = docMovementDetails.getRemark();
this.pickQty = docMovementDetails.getPickQty();
this.outQty = docMovementDetails.getOutQty();
this.recQty = docMovementDetails.getRecQty();
this.moveQty = docMovementDetails.getMoveQty();
this.taskGenerateQty = docMovementDetails.getTaskGenerateQty();
this.srcAreaNo = docMovementDetails.getSrcAreaNo();
this.destAreaNo = docMovementDetails.getDestAreaNo();
this.lotNo = docMovementDetails.getLotNo();
this.srcItem = docMovementDetails.getSrcItem();
this.custOrderNo = docMovementDetails.getCustOrderNo();
this.assignDateCode = docMovementDetails.getAssignDateCode();
this.actualLot = docMovementDetails.getActualLot();
this.actualQty = docMovementDetails.getActualQty();
this.recommondLot = docMovementDetails.getRecommondLot();
this.recommondLocateNo = docMovementDetails.getRecommondLocateNo();
this.isSet = docMovementDetails.getIsSet();
this.dateCode = docMovementDetails.getDateCode();
this.inputMoveQty = docMovementDetails.getInputMoveQty();
this.snp = docMovementDetails.getSnp();
this.detailsSnCount = docMovementDetails.getDetailsSnCount();
this.restQty = docMovementDetails.getRestQty();
this.isTask = docMovementDetails.getIsTask();
this.orderMasterStatus = docMovementDetails.getOrderMasterStatus();
this.printStatus = docMovementDetails.getPrintStatus();
this.priority = docMovementDetails.getPriority();
this.sumQty = docMovementDetails.getSumQty();
this.sumPickQty = docMovementDetails.getSumPickQty();
this.executeStatus = docMovementDetails.getExecuteStatus();
this.lockVersion = docMovementDetails.getLockVersion();
this.moveType = docMovementDetails.getMoveType();
this.busiType = docMovementDetails.getBusiType();
this.isSn = docMovementDetails.getIsSn();
}
}

@ -1,175 +0,0 @@
package cn.estsh.i3plus.pojo.wms.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;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : qianhuasheng
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_SHIPPING_EXT_SN")
@Api("装车单条码明细")
public class WmsTmsShippingExtSn extends BaseBean {
private static final long serialVersionUID = 5704546384179442907L;
@Column(name="MOVE_NO")
@ApiParam("装车单")
public String moveNo;
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
/**
* itemStatus
*/
@Column(name="SN_STATUS")
@ApiParam(value = "操作状态", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer snStatus;
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
public String vendorNo;
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
private Integer snType;
@Transient
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
@Transient
@ApiParam("目标库位代码")
public String destLocateNo;
@Transient
@ApiParam("源库位代码")
public String srcLocateNo;
@Transient
@ApiParam("生产日期")
public String dateCode;
@ApiParam(value = "散件移库输入移库数量")
@Transient
public Double inputMoveQty;
@Transient
@ApiParam("计划交货日期")
private String planDate;
@Transient
@ApiParam("计划交货时间")
private String planTime;
@Transient
@ApiParam("ERP库存地")
private String erpWhNo;
@Transient
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus;
@Transient
@ApiParam("客户零件号")
private String customerPartNo;
@Transient
@ApiParam("父层级packcode对应的可回用零件号")
private String parentReturnPart;
@Transient
@ApiParam("打印模板")
private String templateNo;
@Transient
@ApiParam("剩余箱数量")
private Long countBox;
public WmsTmsShippingExtSn(){}
public WmsTmsShippingExtSn(Long countBox,String partNo) {
this.countBox = countBox;
this.partNo = partNo;
}
public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) {
this.moveNo = moveNo;
this.orderNo = docMovementSn.getOrderNo();
this.item = docMovementSn.getItem();
this.partNo = docMovementSn.getPartNo();
this.partNameRdd = docMovementSn.getPartNameRdd();
this.qty = docMovementSn.getQty();
this.unit = docMovementSn.getUnit();
this.snStatus = docMovementSn.getSnStatus();
this.sn = docMovementSn.getSn();
this.vendorNo = docMovementSn.getVendorNo();
this.snType = docMovementSn.getSnType();
this.isSet = docMovementSn.getIsSet();
this.destLocateNo = docMovementSn.getDestLocateNo();
this.srcLocateNo = docMovementSn.getSrcLocateNo();
this.dateCode = docMovementSn.getDateCode();
this.inputMoveQty = docMovementSn.getInputMoveQty();
this.planDate = docMovementSn.getPlanDate();
this.planTime = docMovementSn.getPlanTime();
this.erpWhNo = docMovementSn.getErpWhNo();
this.itemStatus = docMovementSn.getItemStatus();
this.customerPartNo = docMovementSn.getCustomerPartNo();
this.parentReturnPart = docMovementSn.getParentReturnPart();
this.templateNo = docMovementSn.getTemplateNo();
this.countBox = docMovementSn.getCountBox();
}
}

@ -104,7 +104,7 @@ public class WmsInterfaceDataMapper extends BaseBean {
/**
*
* SAP2WMS, WMS2SAP, MES2WMS
* SAP2WMS, WMS2SAP, MES2WMS,WMS2MES
*/
@Column(name = "GROUP_NAME")
public String groupName;

@ -52,10 +52,10 @@ public class WmsReportTransDetailModel extends BaseBean {
@ApiParam(value = "数量")
private Double qty;
@ApiParam(value = "包规")
@ApiParam(value = "供应商批次")
private String dateCode;
@ApiParam(value = "供应商批次")
@ApiParam(value = "包规")
private Double snp;
@ApiParam(value = "收货批次")

@ -127,7 +127,6 @@ public class WmsTmsShippingExtModel {
this.shippingTime=wmsTmsShippingExt.getCreateDatetime();
this.shippingUser=wmsTmsShippingExt.getCreateUser();
this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation();
this.refOrderNo=wmsTmsShippingExt.getRefOrderNo();
this.orderDate=wmsTmsShippingExt.getCreateDatetime();
}
}

@ -1,17 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @author: qianhuasheng
* @date: 2019/9/19 14:22
* @Modify:
*/
@Repository
public interface IWmsTmsShippingExtDetailRepository extends BaseRepository<WmsTmsShippingExtDetail,Long> {
}

@ -1,17 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @author: qianhuasheng
* @date: 2019/9/19 14:22
* @Modify:
*/
@Repository
public interface IWmsTmsShippingExtSnRepository extends BaseRepository<WmsTmsShippingExtSn,Long> {
}

@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin;
import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate;
import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Strings;
@ -55,7 +56,11 @@ public class WmsHqlPack {
DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
}
// 封装有效状态、删除状态、创建人和创建时间
DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
if (StringUtil.isEmpty(bean.getIsValid())) {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr);
} else {
DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
}
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
return hqlStr;
@ -3371,6 +3376,22 @@ public class WmsHqlPack {
return packBean;
}
/**
*
*
* @param model
* @return
*/
public static DdlPackBean packHqlTmsShip(WmsTmsShipDto model) {
DdlPackBean packBean = WmsHqlPack.packHqlWms(model.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(model.getOrderStatus(), "orderStatus", packBean);
DdlPreparedPack.getStringEqualPack(model.getMoveNo(), "moveNo", packBean);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.FALSE},
new String[]{"createDatetime"}, packBean);
return packBean;
}
/**
* BH

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Loading…
Cancel
Save