合并冲突

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 import java.util.List;
 
@@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode {
     public List<WorkRelation> getPostRelations() {
         return BeanRelation.list(this, EBaseOrder.PostRelations);
     }
-
-    @JsonBackReference
-    public List<BaseOrder> getUpperOrders() {
-        return BeanRelation.list(this, EBaseOrder.UpperOrders);
-    }
-
-    @JsonBackReference
-    public List<BaseOrder> getLowerOrders() {
-        return BeanRelation.list(this, EBaseOrder.LowerOrders);
-    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="内部表名")
     private String inName;
 
-    @Column(name="TYPE")
+    @Column(name="IMPORT_TYPE")
     @ApiParam(value ="导入类型")
     @FieldAnnotation(defaultValue = "REPLACE")
-    private ApsEnumUtil.IMPORT_DETAIL_TYPE type;
+    private ApsEnumUtil.IMPORT_DETAIL_TYPE importType;
+
+    @Column(name="SKIP_ROWS")
+    @ApiParam(value ="跳过行数")
+    @FieldAnnotation(defaultValue = "0")
+    private Integer skipRows;
 
     @Column(name="ORDER_NUMBER")
     @ApiParam(value ="序号")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java

@@ -5,6 +5,4 @@ public enum EBaseOrder {
     Material,
     PrevRelations,
     PostRelations,
-    UpperOrders,
-    LowerOrders
 }

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

@@ -1347,6 +1347,45 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+    /**
+     * 库存移动单状态状态:10=新建,20=已处理,30=处理出错
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMSSHIPPING_ORDER_STATUS {
+        CREATE(10, "新建"),
+        PENDING(20, "已处理"),
+        ERROR(30, "处理出错");
+
+        private int value;
+        private String description;
+
+        WMSSHIPPING_ORDER_STATUS(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) {
+            return valueOf(val);
+        }
+    }
 
     /**
      * 库存移动单明细状态
@@ -4305,6 +4344,99 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 收货看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RECEIVING_GOODS_STATUS {
+        WAIT_RECEIVING(10, "待收货"),
+        RECEIVING(20, "收货中"),
+        COMPLETE_RECEIVING(30, "收货完成"),
+        UN_RECEIVED(40, "延迟未收货"),
+        ELSE(50,"其他");
+
+        private int value;
+        private String description;
+
+        RECEIVING_GOODS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static RECEIVING_GOODS_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 发运看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINAL_SHIPMENT_STATUS {
+        CREATE(10, "新建"),
+        PROCESSING(20, "处理中"),
+        COMPLETE(30, "已完成");
+
+        private int value;
+        private String description;
+
+        FINAL_SHIPMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static FINAL_SHIPMENT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
+
+    /**
      * 生产计划主表状态创建
      * 默认为 10
      */

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

@@ -63,4 +63,18 @@ public class MesDatasource extends BaseBean {
     @ApiParam("设备代码")
     private String equipmentCode;
 
+    @Override
+    public String toString() {
+        return "MesDatasource{" +
+                "dsCode='" + dsCode + '\'' +
+                ", dsName='" + dsName + '\'' +
+                ", dsType='" + dsType + '\'' +
+                ", dsHost='" + dsHost + '\'' +
+                ", dsPort=" + dsPort +
+                ", dsUser='" + dsUser + '\'' +
+                ", dsPassword='" + dsPassword + '\'' +
+                ", dsDbName='" + dsDbName + '\'' +
+                ", equipmentCode='" + equipmentCode + '\'' +
+                '}';
+    }
 }

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

@@ -120,9 +120,9 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
     @Transient
     @ApiParam("返回信息")
@@ -187,7 +187,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
                 ", operateType=" + operateType +
                 ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +

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

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model;
 
 
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -67,9 +66,6 @@ public class ProdPackageModel {
     @ApiParam("包装集合")
     private List<MesPackage> packageList;
 
-    @ApiParam("工单集合")
-    private List<MesWorkOrder> workOrderList;
-
     @ApiParam("打印状态文字")
     private String printStrStatus;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -69,14 +69,12 @@ public class MesHqlPack {
     /**
      * 根据打印模板的模板代码查询模板信息
      *
-     * @param organizeCode
      * @param mesLabelTemplate
      * @return
      */
-    public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
+    public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
-        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
         return packBean;
     }
 

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

@@ -117,9 +117,9 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("条码类型")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
@@ -184,7 +184,7 @@ public class MesProduceSn extends BaseBean {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", operateType=" + operateType +
                 ", resultMsg='" + resultMsg + '\'' +
                 '}';

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

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -30,7 +30,7 @@ import javax.persistence.*;
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "PART_NO")
 })
-@Api("库存移动单主表信息")
+@Api("库存移动单处理成功后的记录")
 public class WmsMoveToERP extends BaseBean {
 
     private static final long serialVersionUID = -6223527594941733060L;

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+@Data
+public class WmsCarDto implements Serializable {
+
+    @Column(name="CAR_NO")
+    @ApiParam(value ="车牌号")
+    private String carNo;
+
+    @Column(name="CAR_DESC")
+    @ApiParam(value ="车辆描述")
+    private String carDesc;
+
+    @Column(name="MAX_CAPACITY")
+    @ApiParam(value ="载重量(KG)")
+    private String maxCapacity;
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="默认驾驶员")
+    private String driverNo;
+
+    @Column(name="PHONE")
+    @ApiParam(value ="车主电话")
+    private String phone;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam(value ="所属供应商")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("司机名称")
+    private String driverNameRdd;
+
+    @Transient
+    @ApiParam(value = "供应商名称")
+    private String vendorNameRdd;
+
+    @ApiParam(value = "是否删除，默认否")
+    private Integer isDeleted = 2;
+
+    @ApiParam("是否有效，默认是")
+    private Integer isValid = 1;
+
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+
+@Data
+public class WmsTmsDriverDto implements Serializable {
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="驾驶员编号")
+    private String driverNo;
+
+    @Column(name="DRIVER_NAME")
+    @ApiParam(value ="驾驶员姓名")
+    private String driverName;
+
+    @Column(name="SEX")
+    @ApiParam(value ="驾驶员性别")
+    private Integer sex;
+
+    @Column(name="AGE")
+    @ApiParam(value ="驾驶员年龄")
+    private String age;
+
+    @Column(name="ID_NO")
+    @ApiParam(value ="驾驶员身份证号")
+    private String idNo;
+
+    @Column(name="ADRESS")
+    @ApiParam(value ="驾驶员籍贯")
+    private String adress;
+
+    @Column(name="PHONE")
+    @ApiParam(value ="车牌号")
+    private String phone;
+
+    @Column(name="LOGIN_NO")
+    @ApiParam(value =" 登录账号")
+    private String loginNo;
+
+    @ApiParam("是否删除，默认否")
+    private Integer isDeleted = 2;
+
+    @ApiParam("是否有效，默认是")
+    private Integer isValid = 1;
+}

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

@@ -44,14 +44,14 @@ public class WmsHqlPack {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-        // 封装有效状态、删除状态、创建人和创建时间
-        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
-        DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
+        DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
         if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
+        // 封装有效状态、删除状态、创建人和创建时间
+        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         return hqlStr;
     }