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

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -127,8 +127,8 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonAlarmCause, result);
 
         return result;
@@ -394,7 +394,7 @@ public class AndonHqlPack {
     public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
         DdlPackBean result = new DdlPackBean();
 
-//        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
 
         getStringBuilderPack(andonAlarmDetailType, result);

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

@@ -246,7 +246,8 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM","质量"),
         EQUIP("EQUMENT_ALARM","设备"),
         PROCESS("ROUTING_ALARM","工艺"),
-        CHECK("OTHER_ALARM","其他");
+        CHECK("OTHER_ALARM","其他"),
+        FIX_ERROR("FIX_ERROR", "设备故障");
 
         private String value;
         private String description;

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

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-06-20 18:50
+ * @Modify:
+ **/
+@Data
+public class ExportDataModel {
+
+    private String className;
+
+    private String exportData;
+
+}

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

@@ -55,7 +55,7 @@ public class SapBase {
     private String staflg = "Y";
 
     @ApiParam(value = "顺序号", example = "-1")
-    private Integer seq = new Random().nextInt();
+    private Integer seq = 1;
 
     @ApiParam(value = "GUID", example = "-1")
     private String guid = UUID.randomUUID().toString();

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

@@ -22,7 +22,7 @@ public class SapMiscr extends SapBase{
 
     @ApiParam(value = "行号",example = "1")
     @AnnoOutputColumn
-    private Double zeile;
+    private Integer zeile;
 
     @ApiParam(value = "工厂",example = "1")
     @AnnoOutputColumn

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

@@ -0,0 +1,79 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-21 13:13
+ * @Modify:
+ **/
+@Data
+@Api(value="库存转储",description = "库存转储")
+public class SapMovo extends SapBase{
+
+    @ApiParam(value = "编号",example = "1")
+    @AnnoOutputColumn
+    private String refid;
+
+    @ApiParam(value = "业务类型",example = "1")
+    @AnnoOutputColumn
+    private String action;
+
+    @ApiParam(value = "行号",example = "1")
+    @AnnoOutputColumn
+    private Integer zeile;
+
+    @ApiParam(value = "工厂",example = "1")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发出库存地点",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "接收库存地点",example = "1")
+    @AnnoOutputColumn
+    private String umlgo;
+
+    @ApiParam(value = "物料编码",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "旧物料编码（针对物料号切换）",example = "1")
+    @AnnoOutputColumn
+    private String ummat;
+
+    @ApiParam(value = "数量",example = "1")
+    @AnnoOutputColumn
+    private String erfmg;
+
+    @ApiParam(value = "计量单位",example = "1")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "库存状态",example = "1")
+    @AnnoOutputColumn
+    private String zstat;
+
+    @ApiParam(value = "特殊库存标识",example = "1")
+    @AnnoOutputColumn
+    private String sobkz;
+
+    @ApiParam(value = "特殊库存描述",example = "1")
+    @AnnoOutputColumn
+    private String htext;
+
+    @ApiParam(value = "状态",example = "1")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+    @ApiParam(value = "不合格单据号",example = "1")
+    @AnnoOutputColumn
+    private String sgtxt;
+
+}

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

@@ -16,7 +16,7 @@ import lombok.Data;
 @Api(value="销售退货",description = "销售退货")
 public class SapRdn extends SapBase{
 
-    @ApiParam(value = "销售交货单",example = "1")
+    @ApiParam(value = "退货交货单",example = "1")
     @AnnoOutputColumn
     private String vbeln;
 

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-21 13:56
+ * @Modify:
+ **/
+@Data
+@Api(value="供应商退货",description = "供应商退货")
+public class SapReto extends SapBase{
+
+    @ApiParam(value = "业务类型",example = "1")
+    @AnnoOutputColumn
+    private String zaction;
+
+    @ApiParam(value = "编号",example = "1")
+    @AnnoOutputColumn
+    private String zinstno;
+
+    @ApiParam(value = "行号",example = "1")
+    @AnnoOutputColumn
+    private String zeile;
+
+    @ApiParam(value = "供应商",example = "1")
+    @AnnoOutputColumn
+    private String lifnr;
+
+    @ApiParam(value = "工厂",example = "1")
+    @AnnoOutputColumn
+    private String umwrk;
+
+    @ApiParam(value = "物料编码",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "库存地点",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "退货数量",example = "1")
+    @AnnoOutputColumn
+    private String erfmg;
+
+    @ApiParam(value = "计量单位",example = "1")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "退货原因",example = "1")
+    @AnnoOutputColumn
+    private String bktxt;
+
+    @ApiParam(value = "SMRR号（或DMR号）",example = "1")
+    @AnnoOutputColumn
+    private String zqmd;
+
+    @ApiParam(value = "状态",example = "1")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+}

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

@@ -56,4 +56,8 @@ public class WmsDataAuth extends BaseBean {
     @ApiParam(value = "查询操作", example = "0")
     private Integer queryOp;
 
+    @Column(name = "ROLE_NAME_RDD")
+    @ApiParam(value = "角色名称")
+    private String roleNameRdd;
+
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -110,6 +111,7 @@ public class WmsStockSn extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     private Double qty;
+
     /**
      * 质量状态:10=合格,20=不合格,30=隔离
      */
@@ -206,7 +208,9 @@ public class WmsStockSn extends BaseBean {
         this.partNo = partNo;
     }
 
-    public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
+    public Double getQty() {
+        return qty == null ? 0L : qty.doubleValue();
+    }
 
     public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.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;
 
 /**
  * @Description : 工作中心线边库区关系
@@ -35,4 +36,12 @@ public class WmsWorkCenterZone extends BaseBean {
     @Column(name = "ZONE_NO")
     @ApiParam(value = "线边库区")
     private String zoneNo;
+
+    @Transient
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Transient
+    @ApiParam("线边库区名称")
+    private String zoneName;
 }

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

@@ -66,4 +66,7 @@ public class WmsDataAuthModel extends BaseBean {
             example = "0"
     )
     private Integer queryOp;
+
+    @ApiParam("角色名称")
+    private String roleNameRdd;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface WmsVendorPartRepository extends BaseRepository<WmsVendorPart, Long>{
 }

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

@@ -1941,4 +1941,20 @@ public class WmsHqlPack {
         return packBean;
     }
 
+    /**
+     * 单位定义
+     *
+     * @param wmsUnit
+     * @return
+     */
+    public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
+        DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
+        getStringBuilderPack(wmsUnit, result);
+
+        return result;
+    }
 }