Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -2519,4 +2519,12 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DYNAMIC_DATA_SOURCE_TYPE {
+        MASTER,NODE
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4100,4 +4100,50 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 停机类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_MACHINE_TYPE {
+        TIMER_TIME_OUT(10, "计时器超时停机"),
+        DELAY_HELP(20, "延时帮助停机"),
+        URGENT_STOP(30, "急停停机");
+
+        private int value;
+        private String description;
+
+        STOP_MACHINE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java

@@ -0,0 +1,72 @@
+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;
+
+/**
+ * @Description :停机记录表
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-03 15:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_AGV_STOP_RECORD")
+@Api("MES_停机记录表")
+public class MesAgvStopRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8961182851767690154L;
+    @Column(name = "STOP_TYPE")
+    @ApiParam("停机类型")
+    private Integer stopType;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "STOP_START_TIME")
+    @ApiParam("停机开始时间")
+    private String stopStartTime;
+
+    @Column(name = "STOP_END_TIME")
+    @ApiParam("停机结束时间")
+    private String stopEndTime;
+
+    @Column(name = "STOP_REASON")
+    @ApiParam("停机原因")
+    private String stopReason;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java

@@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable {
     @ApiParam("缺陷类型")
     private String defectType;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     @Transient
     @ApiParam("缺陷类型名称")
     private String defectTypeName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java

@@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
     @ApiParam("原材料零件名称")
     private String itemPartName;
 
+    @ApiParam("生产队列号")
+    private String orderNo;
+
 
     public int getIsFeedVal() {
         return this.isFeed == null ? 0 : this.isFeed;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable {
     @Column(name = "PROCESS_LABEL_TEMPLATE")
     @ApiParam("过程标签模板")
     private String processLabelTemplate;
+
+    @Transient
+    @ApiParam("产品颜色")
+    private String produceColor;
+
+    @Transient
+    @ApiParam("Vin")
+    private String vinCode;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java

@@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("队列类型名称")
     private String queueTypeName;
 
+    @Transient
+    @ApiParam("产品颜色")
+    private String colorName;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DefectTypeModel<T> implements Serializable {
+
+    // 缺陷/维修
+    @ApiParam("业务类型")
+    private String busiType;
+
+    @ApiParam("List结果集")
+    private List<T> resultList;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RepairAndDefectModel implements Serializable {
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @ApiParam("维修状态")
+    private Integer repairStatus;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @ApiParam("维修名称")
+    private String repairName;
+
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ScatterBomModel implements Serializable {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("个数")
+    private Double qty;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SkinCheckModel implements Serializable {
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("生产号")
+    private String vinCode;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("车型")
+    private String prodCfgTypeCode;
+
+    @ApiParam("等级")
+    private String gradeCode;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    // 产品位置图片
+    private List<MesProduceCtgyPicture> produceCtgyPictureList;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java

@@ -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.MesAgvStopRecord;
+
+/**
+ * @Description: 停机记录数据操作层
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020\06\03 10:34
+ * @Modify:
+ **/
+public interface MesAgvStopRecordRepository extends BaseRepository<MesAgvStopRecord, Long> {
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-29 下午3:40
+ * @Modify:
+ **/
+@Data
+public class ThreadModel implements Serializable {
+
+    @ApiParam(value ="自定义调用ID")
+    private Long requestId;
+    @ApiParam(value ="当前用户ID")
+    private Long userId;
+    @ApiParam(value ="当前用户名称")
+    private String userName;
+    @ApiParam(value ="用户登录IP")
+    private String userHost;
+    @ApiParam(value ="用户登录浏览器")
+    private String userBrowser;
+    @ApiParam(value ="用户登录操作系统")
+    private String userOs;
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java

@@ -47,6 +47,7 @@ public class SysLogConsole extends BaseBean {
 
     @Column(name="LOG_PID")
     @ApiParam(value ="应用PID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long logPid;
 
     @Column(name="LOG_PORT")
@@ -89,6 +90,10 @@ public class SysLogConsole extends BaseBean {
     private String userLoginName;
 
     /******** 日志信息 ********/
+    @Column(name="REQUEST_ID")
+    @ApiParam(value ="请求ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
 
     @Column(name="EXECUTE_THREAD_ID")
     @ApiParam(value ="执行线程")

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.report.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BR_CSS_STYLE")
+@Api(value="自定义样式")
+public class BrCssStyle extends BaseBean {
+
+    private static final long serialVersionUID = 8651392479116992679L;
+
+    @Column(name="STYLE_CODE")
+    @ApiParam(value ="样式编码")
+    private String styleCode;
+
+    @Column(name="STYLE_CONTENT")
+    @ApiParam(value ="样式内容")
+    private String styleContent;
+
+    @Column(name="STYLE_DESCRIPTION")
+    @ApiParam(value ="样式描述")
+    private String styleDescription;
+
+}

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.report.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.report.bean.BrCssStyle;
+import cn.estsh.i3plus.pojo.report.bean.BrElement;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface BrCssStyleRepository extends BaseRepository<BrCssStyle,Long> {
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "是否推送MQ")
     private Integer isPushMQ;
 
-    @Column(name = "RESULT_SOFT_TYPE")
+    @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0")
     @ApiParam(value = "同步调用微服务")
     private Integer resultSoftType;
     public String getResultSoftTypeTxt() {

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

@@ -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;
@@ -345,6 +347,11 @@ public class WmsDocMovementDetails extends BaseBean {
     public Integer isSn;
 
 
+    @Column(name = "REF_SRC")
+    @ApiParam("关联单号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    public String refSrc;
+
     public WmsDocMovementDetails () {
 
     }

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

@@ -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;
     }

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

@@ -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();

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

@@ -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;
 }

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

@@ -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;

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

@@ -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() {

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

@@ -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;

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

@@ -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;

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

@@ -60,9 +60,9 @@ public class WmsTmsShippingExtDetail extends BaseBean {
 	@ApiParam("单位")
 	public String unit;
 
-	@Column(name = "ORDER_NO")
-	@ApiParam("订单号")
-	public String orderNo;
+	@Column(name = "REF_ORDER_NO")
+	@ApiParam("关联单号")
+	private String refOrderNo;
 
 	@Column(name = "SRC_WH_NO")
 	@ApiParam("源仓库代码")
@@ -308,7 +308,6 @@ public class WmsTmsShippingExtDetail extends BaseBean {
 		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();
@@ -331,6 +330,7 @@ public class WmsTmsShippingExtDetail extends BaseBean {
 		this.destAreaNo = docMovementDetails.getDestAreaNo();
 		this.lotNo = docMovementDetails.getLotNo();
 		this.srcItem = docMovementDetails.getSrcItem();
+		this.refOrderNo = docMovementDetails.getOrderNo();
 		this.custOrderNo = docMovementDetails.getCustOrderNo();
 		this.assignDateCode = docMovementDetails.getAssignDateCode();
 		this.actualLot = docMovementDetails.getActualLot();

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

@@ -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();
 	}
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -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;
@@ -3371,6 +3372,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检测大类表查询条件

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./