diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 2e9a6f6..a0ee7fc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.andon.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -47,6 +48,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description") private String alarmCode; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index 909db97..85dbd40 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -60,7 +60,7 @@ public class XStreamFactory { } }); - xStream.setMode(XStream.NO_REFERENCES); +// xStream.setMode(XStream.NO_REFERENCES); xStream.autodetectAnnotations(true); return xStream; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java similarity index 92% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 787d5c0..e6c7938 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils; * @CreateDate : 2019-08-13 9:34 * @Modify: **/ -public class SoftSwitchEnumUtil { +public class BlockSoftSwitchEnumUtil { /** * 套件类型 @@ -234,7 +234,7 @@ public class SoftSwitchEnumUtil { return tmp; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { + public static DATA_SOURCE_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -267,7 +267,7 @@ public class SoftSwitchEnumUtil { return null; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ return SOURCE_MARIA_DB; @@ -443,4 +443,39 @@ public class SoftSwitchEnumUtil { } } + /** + * 数据库操作方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATABASE_OPERATE_TYPE{ + READ(1,"读取"), + WRITE(2,"写入"); + + private int value; + private String description; + + DATABASE_OPERATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index dea5ebf..ed8e820 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -341,6 +341,8 @@ public final class FormHqlPack { DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result); DdlPreparedPack.getNumEqualPack( + CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack( CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // 按顺序字段进行排序 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java new file mode 100644 index 0000000..cf7567b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 适配器model + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-04 15:30 + * @Modify: + **/ +@Data +public class BsSuitCaseModel { + + @ApiParam(value = "适配器") + BsSuitCase bsSuitCase; + + @ApiParam(value = "数据源适配套件") + BsSuitCaseDataSource bsDataSourceSuitCase; + + @ApiParam(value = "socket适配套件") + BsSocketSuitCase bsSocketSuitCase; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index 3b748f8..2283d83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -86,15 +86,19 @@ public class SuitCoreModel { private String suitResultMessage; /** - * * @param requestSource 请求来源 - * @param sslKey 适配认证对象 - * @param bsSuitCase 适配器信息 + * @param sslKey 适配认证对象 + * @param bsSuitCase 适配器信息 */ - public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) { + public SuitCoreModel(Integer requestSource, BsSslKey sslKey, BsSuitCase bsSuitCase){ + this(requestSource,sslKey, bsSuitCase,null); + } + + public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase,Object bsSuitCaseDetail) { this.sslKey = sslKey; this.bsSuitCase = bsSuitCase; this.requestSource = requestSource; + this.bsSuitCaseDetail = bsSuitCaseDetail; // 设置套件类型 this.caseType = bsSuitCase.getCaseTypeId(); diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index eeca022..5881a9c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -61,7 +61,7 @@ public class BsDataSource extends BaseBean { @Column(name = "DATA_SOURCE_STATUS") @ApiParam(value = "数据源状态") - private String dataSourceStatus; + private Integer dataSourceStatus; @Column(name = "DATA_SOURCE_DESCRIPTION") @ApiParam(value = "数据源描述") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index f5d8f9e..db8c3a3 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -107,7 +107,15 @@ public class BsSuitCase extends BaseBean { private Integer suitCaseStatus; @Transient + @ApiParam(value = "适配器套件明细") + private Object bsSuitCaseDetail; + + @Transient @ApiParam(value = "适配器参数") - List bsSuitCaseParamList; + private List bsSuitCaseParamList; + + @Transient + @ApiParam(value = "参数转换") + private List bsParamAdapterList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java similarity index 78% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java index 738d19a..7ffc6d1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 数据库套件 @@ -25,9 +27,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_DATA_SOURCE_SUIT_CASE") +@Table(name = "BS_SUIT_CASE_DATA_SOURCE") @Api(value = "数据库套件", description = "数据库套件") -public class BsDataSourceSuitCase extends BaseBean { +public class BsSuitCaseDataSource extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @@ -46,5 +48,12 @@ public class BsDataSourceSuitCase extends BaseBean { @ApiParam(value = "数据源名称") private String dataSourceNameRdd; + @Transient + @ApiParam(value = "数据源") + private BsDataSource bsDataSource; + + @Transient + @ApiParam(value = "数据库操作") + private List bsDataSourceSuitCaseTableList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java similarity index 77% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java index 5e86604..838514a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE") +@Table(name = "BS_SUIT_CASE_DATA_SOURCE_TABLE") @Api(value = "数据库表操作", description = "数据库表操作") -public class BsDataSourceSuitCaseTable extends BaseBean { +public class BsSuitCaseDataSourceTable extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @@ -42,6 +42,13 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @ApiParam(value = "操作类型") private Integer operateTypeId; + public int getOperateTypeIdVal(){ + if(operateTypeId == null){ + return -1; + } + return operateTypeId.intValue(); + } + @Column(name = "EXECUTE_SQL") @ApiParam(value = "执行sql") private String executeSql; @@ -52,7 +59,14 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @Column(name = "IS_RETURN") @ApiParam(value = "是否有返回") - private String isReturn; + private Integer isReturn; + + public int getIsReturnVal(){ + if(isReturn == null){ + return -1; + } + return isReturn.intValue(); + } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java index eadac50..2ef87e4 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseRepository extends BaseRepository { +public interface BsDataSourceSuitCaseRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java index 16100db..750f45a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { +public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 85fd21b..406067c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -3,7 +3,6 @@ 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 com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -174,6 +173,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("创建时间") private String createDateTime; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 64c423c..8a251d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -144,6 +144,11 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "设备编号") public String fixId; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + public WmsMoveMaster(){}; public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 5f423a0..6f7e434 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -25,7 +25,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_SN", indexes = { +@Table(name = "WMS_MOVE_SN", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "SN"), @@ -35,80 +35,80 @@ import javax.persistence.*; public class WmsMoveSn extends BaseBean { private static final long serialVersionUID = 1490715681910614399L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; - @Column(name="ITEM") + @Column(name = "ITEM") @ApiParam("行号") public Integer item; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam(value = "单位") public String unit; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; - @Column(name="CSN") + @Column(name = "CSN") @ApiParam("客户条码") public String csn; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String remark; - @Column(name="LOT_NO") + @Column(name = "LOT_NO") @ApiParam("批次编号") public String lotNo; - @Column(name="PACKAGE_NO") + @Column(name = "PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; - @Column(name="SRC_QTY") + @Column(name = "SRC_QTY") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; - @Column(name="SRC_WH_NO") + @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") public String srcWhNo; - @Column(name="SRC_ZONE_NO") + @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") public String srcZoneNo; - @Column(name="SRC_LOCATE_NO") + @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; - @Column(name="DEST_WH_NO") + @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") public String destWhNo; - @Column(name="DEST_ZONE_NO") + @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") public String destZoneNo; - @Column(name="DEST_LOCATE_NO") + @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; @@ -120,51 +120,51 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name="DEST_QTY") + @Column(name = "DEST_QTY") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name="QTY") + @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; - @Column(name="SRC_QC_STATUS") + @Column(name = "SRC_QC_STATUS") @ApiParam(value = "源质量状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") public Integer srcQcStatus; - @Column(name="SRC_SN_STATUS") + @Column(name = "SRC_SN_STATUS") @ApiParam(value = "源条码状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") public Integer srcSnStatus; - @Column(name="DEST_QC_STATUS") + @Column(name = "DEST_QC_STATUS") @ApiParam(value = "目的质量状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") public Integer descQcStatus; - @Column(name="DEST_SN_STATUS") + @Column(name = "DEST_SN_STATUS") @ApiParam(value = "目的条码状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") public Integer destSnStatus; - @Column(name="DATE_CODE") + @Column(name = "DATE_CODE") @ApiParam("生产日期") public String dateCode; - @Column(name="FIX_LOT_NO") + @Column(name = "FIX_LOT_NO") @ApiParam("特殊批次") public String fixLotNo; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") private String vendorNo; @Transient @ApiParam("业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Transient @@ -183,9 +183,15 @@ public class WmsMoveSn extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - public WmsMoveSn(){} + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; - public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ + public WmsMoveSn() { + } + + public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) { this.partNo = partNo; this.waitingCounts = waitingCounts; this.finishedCounts = finishedCounts; @@ -199,7 +205,7 @@ public class WmsMoveSn extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode, String transTypeCode, String refSrc) { + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -207,7 +213,8 @@ public class WmsMoveSn extends BaseBean { this.transTypeCode = transTypeCode; this.refSrc = refSrc; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) { + + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -215,38 +222,38 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } - public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, - String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, - Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn, - String createUser,String createDatetime,String modifyDatetime,String modifyUser){ - this.organizeCode=organizeCode; - this.orderNo=orderNo; - this.item=item; - this.partNo=partNo; - this.partNameRdd=partNameRdd; - this.transTypeCode=transTypeCode; - this.transTypeName=transTypeName; - this.itemStatus=itemStatus; - this.unit=unit; - this.srcLocateNo=srcLocateNo; - this.destLocateNo=destLocateNo; - this.srcQty=srcQty; - this.srcQty=srcQty; - this.destQty=destQty; - this.srcQcStatus=srcQcStatus; - this.descQcStatus=descQcStatus; - this.srcSnStatus=srcSnStatus; - this.destSnStatus=destSnStatus; - this.lotNo=lotNo; - this.dateCode=dateCode; - this.refSrc = refSrc; - this.destZoneNo = destZoneNo; - this.destWhNo =destWhNo; - this.busiTypeCode = busiTypeCode; - this.sn = sn; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; } }