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

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

@@ -2761,4 +2761,38 @@ public class WmsEnumUtil {
             }
             return null;
     }
+
+    /**
+     * ERP同步标识 10=待同步，20=同步成功，30=同步失败
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_ERP_SYNC_FLAG {
+        CREATE(10, "待同步"), SUCCESS(20, "同步成功"), FAIL(30, "同步失败");
+
+        private int value;
+        private String description;
+
+        WMS_ERP_SYNC_FLAG(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;
+        }
+    }
 }

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

@@ -0,0 +1,112 @@
+package cn.estsh.i3plus.pojo.wms.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.ColumnDefault;
+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 : amy
+ * @CreateDate : 2019-06-28 15:12
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="AMP_JIS_REC")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="AMP_JIS收货",description = "AMP_JIS收货")
+public class AmpJisRec extends BaseBean{
+
+    @Column(name="ORDER_NO")
+    @ApiParam("JIS单号")
+    public String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错
+     */
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "状态", example = "10")
+    public Integer orderStatus;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam(value = "g供应商编码", example = "10")
+    public Integer vendorNo;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    @Column(name="SHIPPING_FLAG")
+    @ApiParam("特殊发货标志")
+    public String shippingFlag;
+
+    @Column(name="ERROR_MESSAGE")
+    @ApiParam("错误信息")
+    public String errorMessage;
+
+    @Column(name="AREA_NO")
+    @ApiParam("ERP库存地")
+    public String areaNo;
+
+    @Column(name="CAR_NO")
+    @ApiParam("车号")
+    public String carNo;
+
+    @Column(name="VIN")
+    @ApiParam("VIN号")
+    public String vin;
+
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    public String shippingTime;
+
+    @Column(name="SID")
+    @ApiParam("sid")
+    public String sid;
+
+    @Column(name="IS_LOCK")
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    public Integer isLock;
+
+    @Column(name="ERP_SYNC_FLAG")
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    public Integer erpSyncFlag;
+
+}

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

@@ -110,6 +110,10 @@ public class SapDocFgSum extends BaseBean {
     @Column(name = "EFF_START_TIME")
     private String effStartTime;
 
+    @Transient
+    @ApiParam(value = "备注")
+    private String errorMsg;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @Transient
     public Long wdfdId;

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description : 库存移动单主表信息
@@ -52,6 +49,7 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
 
+    @Lob
     @Column(name = "ERROR_MESSAGE")
     @ApiParam(value = "错误信息")
     private String errorMessage;

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

@@ -161,6 +161,9 @@ public class WmsMoveToERP extends BaseBean {
     @Transient
     private Long finishedCounts;
 
+    @Transient
+    private Long shippingId;
+
     public Double getRejectQty(){
         return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
     }

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

@@ -78,6 +78,10 @@ public class WmsShipping extends BaseBean {
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    public String shippingTime;
+
     @Transient
     @ApiParam(value ="客户简称")
     private String custName;
@@ -89,4 +93,33 @@ public class WmsShipping extends BaseBean {
     @Column(name="AREA_NO")
     @ApiParam("ERP库存地")
     public String areaNo;
+
+    @Column(name="CAR_NO")
+    @ApiParam("车号")
+    public String carNo;
+
+    @Column(name="ERROR_MESSAGE")
+    @ApiParam("错误信息")
+    public String errorMessage;
+
+    @Column(name="IS_LOCK")
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    public Integer isLock;
+
+    @Column(name="ERP_SYNC_FLAG")
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    public Integer erpSyncFlag;
+
+    public WmsShipping(){}
+
+    public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) {
+        this.id = id;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.unit = unit;
+        this.custNo = custNo;
+        this.carNo = carNo;
+        this.areaNo = areaNo;
+    }
 }

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.AmpJisRec;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface AmpJisRecRepository extends BaseRepository<AmpJisRec,Long> {
+}

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

@@ -1137,6 +1137,17 @@ public class WmsHqlPack {
         return result;
     }
 
+    public static DdlPackBean packHqlcheckSNInLocate(WmsStockQuan wmsStockQuan) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+
+        result.setWhereAppend(result.getWhereAppend()+" and qty  > 0 ");
+        getStringBuilderPack(wmsStockQuan, result);
+
+        return result;
+    }
+
     /**
      * 质检单明细信息 查询条件封装
      *