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/BlockFormEnumUtil.java

@@ -1162,15 +1162,15 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PROPERTY_TYPE {
-        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE),
-        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL),
-        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL),
-        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL);
-//        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME);
+        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null),
+        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
+        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
+        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
+//        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
 
         /**
          * 属性类型值
@@ -1202,7 +1202,12 @@ public class BlockFormEnumUtil {
          */
         private SQL_WHERE defaultWhere;
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
+        /**
+         * 默认查询关系
+         */
+        private String defaultValue;
+
+        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1210,6 +1215,7 @@ public class BlockFormEnumUtil {
             this.clzFullName = clzFullName;
             this.controlType = controlType;
             this.defaultWhere = defaultWhere;
+            this.defaultValue = defaultValue;
         }
 
         public int getValue() {

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

@@ -0,0 +1,136 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description :SAP_产品报工汇总表
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-27 15:40
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SAP_DOC_FG_SUM")
+@Api("SAP_产品报工汇总表")
+public class SapDocFgSum extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam(value = "物料编码")
+    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="ERP_WORK_CENTER")
+    @ApiParam("ERP_工作中心")
+    public String erpWorkCenter;
+
+    @Column(name="IN_AREA_NO")
+    @ApiParam("入库ERP库存地")
+    public String inAreaNo;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("子物料号")
+    public String itemPartNo;
+
+    @Column(name="ITEM_PART_NAME")
+    @ApiParam("子料物料描述")
+    public String itemPartName;
+
+    @Column(name="ITEM_UNIT")
+    @ApiParam("子计量单位")
+    public String itemUnit;
+
+    @Column(name="ITEM_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "子用量", example = "0")
+    public Double itemQty;
+
+    @Column(name="OUT_AREA_NO")
+    @ApiParam("消耗ERP库存地")
+    public String outAreaNo;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错
+     */
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    /**
+     * 数据来源:ZMMES=知明MES,TBMES=MES接口
+     */
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    /**
+     * 是否锁定：1=锁定 2=未锁定
+     */
+    @Column(name="IS_LOCK")
+    @ApiParam(value = "是否锁定", example = "2")
+    public Integer isLock;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "BOM生效日期")
+    @Column(name = "EFF_START_TIME")
+    private String effStartTime;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Transient
+    public Long wdfdId;
+
+    public SapDocFgSum(){}
+    public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
+                       String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {
+        this.wdfdId = wdfdId;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.unit = unit;
+        this.erpWorkCenter = erpWorkCenter;
+        this.inAreaNo = inAreaNo;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.itemUnit = itemUnit;
+        this.outAreaNo = outAreaNo;
+        this.itemQty = itemQty;
+        this.src = src;
+        this.isLock = isLock;
+        this.effStartTime = effStartTime;
+    }
+}

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

@@ -85,4 +85,8 @@ public class WmsShipping extends BaseBean {
     @Transient
     @ApiParam(value = "发往地简称")
     private String flagName;
+
+    @Column(name="AREA_NO")
+    @ApiParam("ERP库存地")
+    public String areaNo;
 }

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

@@ -64,25 +64,25 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "物料名称")
     private String partNameRdd;
 
-    @Column(name = "LOT_NO")
+    @Column(name = "LOT_NO", nullable = false)
     @ApiParam("收货日期（批次编码）")
-    public String lotNo;
+    public String lotNo = "";
 
-    @Column(name = "DATE_CODE")
+    @Column(name = "DATE_CODE", nullable = false)
     @ApiParam(value = "生产日期")
-    public String dateCode;
+    public String dateCode = "";
 
-    @Column(name = "LEFT_CODE")
+    @Column(name = "LEFT_CODE", nullable = false)
     @ApiParam(value = "有效期")
-    private String leftCode;
+    private String leftCode = "";
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
-    @Column(name = "FIX_LOT_NO")
+    @Column(name = "FIX_LOT_NO", nullable = false)
     @ApiParam(value = "特殊批次")
-    private String fixLotNo;
+    private String fixLotNo = "";
 
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")

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

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

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

@@ -1129,7 +1129,9 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
-
+        if(wmsStockSn.getIsValid()!= null){
+            DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result);
+        }
         getStringBuilderPack(wmsStockSn, result);
 
         return result;
@@ -2051,4 +2053,18 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 根据id集合查询生产报工明细表的数据
+     *
+     * @param ids
+     * @return
+     */
+    public static DdlPackBean packHqlWmsDocFgDetail(List<Long> ids) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(ids,"id",result);
+
+        return result;
+    }
 }