Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("BH子检测项")
 public class WmsBhChildDetectionItem extends BaseBean {
 
+    private static final long serialVersionUID = -8005468634643773682L;
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测大类")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java

@@ -34,6 +34,7 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "bom历史记录", description = "bom历史记录")
 public class WmsBomHistory extends BaseBean {
+    private static final long serialVersionUID = -2781401699752981565L;
     @Column(name = "PART_NO")
     @ApiParam(value = "父物料号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api("车辆信息")
 public class WmsCar extends BaseBean {
 
+    private static final long serialVersionUID = -905792638347428695L;
     @Column(name = "CAR_NO")
     @ApiParam(value = "车牌号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api(value="客户窗口时间",description = "客户窗口时间")
 public class WmsCustWindow extends BaseBean {
 
+    private static final long serialVersionUID = -6544671103929721988L;
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")
     private String custNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="客户物料发往地",description = "客户物料发往地")
 public class WmsCustomerPartShipping extends BaseBean {
 
+    private static final long serialVersionUID = 9091356911517332847L;
     @Column(name = "CUSTOMER_CODE")
     @ApiParam(value = "客户代码")
     private String customerCode;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Table(name="WMS_DOCK")
 @Api("道口预约信息")
 public class WmsDock extends BaseBean {
+    private static final long serialVersionUID = 1084849307899138229L;
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api("道口预约信息")
 public class WmsDockOrderInfo extends BaseBean {
 
+    private static final long serialVersionUID = -18500387985953214L;
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockWindowTime.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("道口窗口时间")
 public class WmsDockWindowTime extends BaseBean {
 
+    private static final long serialVersionUID = -3188113111546998811L;
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api(value = "物流费用管理", description = "物流费用管理")
 public class WmsLogisticsCosts extends BaseBean {
 
+    private static final long serialVersionUID = -5307311210847854654L;
     @Column(name = "ORGANIZE_NAME")
     @ApiParam(value = "工厂名称")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api(value = "运输方式", description = "运输方式")
 public class WmsModeTransport extends BaseBean {
 
+    private static final long serialVersionUID = 2323715097364547677L;
     @Column(name = "ORGANIZE_NAME")
     @ApiParam(value = "工厂名称")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("物料检测大类")
 public class WmsPartCheckType extends BaseBean {
 
+    private static final long serialVersionUID = -5189386821943180930L;
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api("物料扩展属性表")
 public class WmsPartExtend extends BaseBean {
 
+    private static final long serialVersionUID = 353287580297379377L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
     private String partNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("物料子检测项")
 public class WmsPartItemCheck extends BaseBean {
 
+    private static final long serialVersionUID = 2889708862689686630L;
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="物料关系表",description = "物料关系表")
 public class WmsPartRelation extends BaseBean {
 
+    private static final long serialVersionUID = -3532040201124896970L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
     private String partNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProcurementPlanContract.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("开口合同PO关系表")
 public class WmsProcurementPlanContract extends BaseBean {
 
+    private static final long serialVersionUID = 3966394697226562966L;
     @Column(name = "ORDER_NO")
     @ApiParam(value = "合同号")
     private String orderNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java

@@ -1,7 +1,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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -20,6 +19,7 @@ import java.io.Serializable;
 @Api(value="生产退料导入模板",description = "生产退料导入模板")
 public class WmsProductReturnMovement implements Serializable{
 
+    private static final long serialVersionUID = -4099139082544312496L;
     @ApiParam(value = "单号")
     @AnnoOutputColumn
     private String orderNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息")
 public class WmsProviderFlag extends BaseBean {
 
+    private static final long serialVersionUID = -4732299479463118555L;
     @Column(name = "ORGANIZE_NAME")
     @ApiParam(value = "工厂名称")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Table(name = "WMS_PULL_RULE")
 @Api("拉动规则")
 public class WmsPullRule extends BaseBean {
+    private static final long serialVersionUID = -4259512587710548316L;
     @Column(name = "PULL_WAY")
     @ApiParam(value = "拉动类型", example = "10")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java

@@ -25,13 +25,14 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name = "WMS_LOGISTICS_COSTS")
+@Table(name = "WMS_SHORT_LOGISTICS_COSTS")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "物流费用管理", description = "物流费用管理")
 public class WmsShortLogisticsCosts extends BaseBean {
 
+    private static final long serialVersionUID = 733863151632950809L;
     @Column(name = "ORGANIZE_NAME")
     @ApiParam(value = "工厂名称")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api(value="条码操作记录表",description = "条码操作记录表")
 public class WmsSnOperateRecord extends BaseBean {
 
+    private static final long serialVersionUID = -8163029081131228416L;
     @Column(name = "SN")
     @ApiParam(value = "条码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api("库存初始化信息")
 public class WmsStockInitialize extends BaseBean {
 
+    private static final long serialVersionUID = -6653811290493674698L;
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
     @AnnoOutputColumn(required = false)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api("替代料")
 public class WmsSubPart extends BaseBean {
 
+    private static final long serialVersionUID = -8864784324056827764L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api("驾驶员信息")
 public class WmsTmsDriver extends BaseBean {
 
+    private static final long serialVersionUID = 2083909056682628791L;
     @Column(name="DRIVER_NO")
     @ApiParam(value ="驾驶员编号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api("装车单信息")
 public class WmsTmsShippingExt extends BaseBean {
 
+    private static final long serialVersionUID = -3261413137866351406L;
     @Column(name="MOVE_NO")
     @ApiParam(value ="移库单号")
     private String moveNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="供应商计划员",description = "供应商计划员")
 public class WmsVendorPlanner extends BaseBean {
 
+    private static final long serialVersionUID = 6444925010696953067L;
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="供应商父子关系",description = "供应商父子关系")
 public class WmsVendorRelation extends BaseBean {
 
+    private static final long serialVersionUID = 723387673958938803L;
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="供应商窗口时间",description = "供应商窗口时间")
 public class WmsVendorWindow extends BaseBean {
 
+    private static final long serialVersionUID = -8156667748890281030L;
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -26,6 +27,7 @@ import javax.persistence.Table;
 @Table(name = "WMS_INTERFACE_DATA_MAPPER")
 @Api("接口数据映射")
 public class WmsInterfaceDataMapper extends BaseBean {
+    private static final long serialVersionUID = 4139044040492108498L;
     /**
      * 排序编号
      */

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java

@@ -4,12 +4,12 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 @Data
 public class WmsCarDto extends BaseDto implements Serializable {
 
+    private static final long serialVersionUID = 1477585131669086208L;
     @Column(name="CAR_NO")
     @ApiParam(value ="车牌号")
     private String carNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java

@@ -16,6 +16,7 @@ import java.io.Serializable;
 @Data
 public class WmsTmsDriverDto extends BaseDto implements Serializable {
 
+    private static final long serialVersionUID = 1686388995931944419L;
     @Column(name="DRIVER_NO")
     @ApiParam(value ="驾驶员编号")
     private String driverNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Api("装车单批量入参")
 @Data
 public class WmsTmsShipBacthDto extends BaseDto implements Serializable {
+    private static final long serialVersionUID = -6901734563284429774L;
     @ApiParam("装车单集合")
       private  List<WmsTmsShipDto> wmsTmsShipDtoList=new ArrayList<>();
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -17,6 +17,7 @@ import java.io.Serializable;
 @Data
 public class WmsTmsShipDto extends BaseDto implements Serializable {
 
+    private static final long serialVersionUID = -523839265877092396L;
     @ApiParam("物料号")
     private String partNo;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Table(name = "DROOLS_RULE_PERSISTENCE")
 @Api("系统动态业务规则")
 public class EngineRulePersistence extends BaseBean {
+    private static final long serialVersionUID = 5119552483383770556L;
     // 规则调用的唯一编号，例如：WMS_RECEIVE_0001
     @Column(name = "RULE_NO", length = 50)
     private String ruleNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java

@@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import javax.persistence.Column;
-import javax.script.CompiledScript;
+import javax.persistence.Entity;
-import javax.script.ScriptContext;
+import javax.persistence.Lob;
-import javax.script.ScriptEngine;
+import javax.persistence.Table;
-import javax.script.ScriptException;
+import javax.persistence.Transient;
 
 /**
  * 脚本持久化实体类
@@ -30,6 +29,7 @@ import javax.script.ScriptException;
 @Table(name = "SCRIPT_PERSISTENCE")
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
+    private static final long serialVersionUID = 7893111140559759490L;
     // 脚本调用的唯一编号，例如：WMS_PDA_0001
     @Column(name = "SCRIPT_NO", length = 50)
     private String scriptNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java

@@ -30,6 +30,7 @@ import javax.persistence.Transient;
 @Api("系统动态脚本")
 public class EngineScriptPersistenceHistory extends BaseBean {
 
+    private static final long serialVersionUID = 7201021903118622899L;
     // 脚本调用的唯一编号，例如：WMS_PDA_0001
     @Column(name = "SCRIPT_NO", length = 50)
     private String scriptNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java

@@ -18,6 +18,7 @@ import lombok.Data;
 @Api("供应商微服调用Model")
 public class WmsBasVendorModel extends BaseBean {
 
+    private static final long serialVersionUID = -4097250031510982530L;
     @ApiParam("供应商")
     private BasVendor basVendor;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Api("数据权限Model")
 public class WmsDataAuthModel extends BaseBean {
 
+    private static final long serialVersionUID = -1830754107669382563L;
     @ApiParam("角色编号")
     private String roleCode;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java

@@ -14,6 +14,7 @@ import lombok.Data;
 @Api("未完成订单模型")
 public class WmsMoveUnfinishedOrderModel extends  BaseBean{
 
+    private static final long serialVersionUID = 363976915707604557L;
     @ApiParam("物料编码")
     private String partNo;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
 import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -19,6 +18,7 @@ import lombok.Data;
 @Api("供应商微服调用Model")
 public class WmsPartModel extends BaseBean {
 
+    private static final long serialVersionUID = -4435519990466605445L;
     @ApiParam("物料")
     private WmsPart wmsPart;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java

@@ -18,6 +18,7 @@ import java.time.LocalTime;
 @Api("供应商收货看板")
 public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRecvModel> {
 
+    private static final long serialVersionUID = 7985236317993813219L;
     @ApiParam("订单号")
     private String orderNo;
     @ApiParam("供应商名称")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java

@@ -18,7 +18,9 @@ import javax.persistence.Entity;
 @Entity
 @Api("静态盘点查询输出model")
 public class WmsStaticCsModel extends BaseBean {
-    public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) {
+    private static final long serialVersionUID = 9039981061448266666L;
+
+    public WmsStaticCsModel(String staticStr, String orderNo, String locateNo, String sn, double qty) {
         this.orderNo = orderNo;
         this.locateNo = locateNo;
         this.sn = sn;