Merge branch 'test'

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),
+        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),
+        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),
+        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),
+        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),
+        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),
+        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),
+        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);
+        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);
+//        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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -722,20 +722,13 @@ public class CommonEnumUtil {
     }
 
     /**
-     * 客户端操作系统
+     * 客户端登录标识
-     *             return "Windows";
-     *             return "Mac";
-     *             return "Unix";
-     *             return "Android";
-     *             return "IPhone";
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_LOGIN_PLATFORM {
-        WINDOWS(1, "Windows", "Windows 操作系统"),
+        PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"),
-        MAC(2, "Mac", "Mac 操作系统"),
+        PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"),
-        UNIX(3, "Unix", "Linux 操作系统"),
+        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端");
-        ANDROID(4, "Android", "Android 操作系统"),
-        IPHONE(5, "IPhone", "IPhone 操作系统");
 
         private int value;
         private String name;
@@ -762,11 +755,11 @@ public class CommonEnumUtil {
             return name;
         }
 
-        public static String valueOf(int val) {
+        public static LOG_LOGIN_PLATFORM valueOf(int val) {
-            String tmp = null;
+            LOG_LOGIN_PLATFORM tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].getName();
+                    tmp = values()[i];
                 }
             }
             return tmp;

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

@@ -2,6 +2,12 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description :
  * @Reference :
@@ -2567,7 +2573,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_TRANS_QUAN_STATUS {
-        CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败");
+        CREATE(1, "创建"), SUCCESS(10, "处理成功"), FAIL(30, "处理失败");
 
         private int value;
         private String description;
@@ -2702,4 +2708,56 @@ public class WmsEnumUtil {
             return description;
         }
     }
+
+    public static  Map<String, Object> getEnumByName(String enumName) throws Exception{
+            Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+            Class<Enum> clazz;
+            Enum[] enumConstants;
+
+            Map<String, Object> enumMap;// 枚举类
+            List<Map<String, Object>> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】
+            Map<String, Object> value;// 枚举实例属性
+
+            Method getValue;
+            Method getCode;
+            Method getDescription;
+
+            // 遍历内部类
+            String simpleName;//内部类的类名
+            for (Class class1 : innerClazz) {
+                //获取内部内的类名
+                simpleName = class1.getSimpleName();
+                if (simpleName.equals(enumName)) {
+                    // 判断类是不是枚举类
+                    clazz = (Class<Enum>) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName);
+
+                    // 枚举类方法初始化
+                    getCode = null;
+                    try {
+                        getCode = clazz.getMethod("getCode");
+                    } catch (NoSuchMethodException e) {
+                    }
+                    getValue = clazz.getMethod("getValue");
+                    getDescription = clazz.getMethod("getDescription");
+
+                    // 获取所有枚举实例
+                    enumConstants = clazz.getEnumConstants();
+                    enumMap = new HashMap<>();
+                    values = new ArrayList<>();
+                    for (Enum enum1 : enumConstants) {
+                        value = new HashMap<>();
+                        value.put("value", getValue.invoke(enum1));
+                        if (getCode != null) {
+                            value.put("code", getCode.invoke(enum1));
+                        }
+                        value.put("description", getDescription.invoke(enum1));
+                        values.add(value);
+                    }
+                    enumMap.put("enumName", clazz.getSimpleName());
+                    enumMap.put("valuesList", values);
+                    return enumMap;
+                }
+            }
+            return null;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java

@@ -9,6 +9,10 @@ package cn.estsh.i3plus.pojo.base.shirotoken;
  **/
 public class AdminToken extends BaseToken {
 
+    public AdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
+
     public AdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java

@@ -14,6 +14,7 @@ public class BaseToken implements AuthenticationToken {
     private String loginName;
     private String loginPwd;
     private String languageCode;
+    private Integer loginPlatform;
 
     public BaseToken(String loginName, String loginPwd, String languageCode) {
         this.loginName = loginName;
@@ -21,6 +22,13 @@ public class BaseToken implements AuthenticationToken {
         this.languageCode = languageCode;
     }
 
+    public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        this.loginName = loginName;
+        this.loginPwd = loginPwd;
+        this.languageCode = languageCode;
+        this.loginPlatform = loginPlatform;
+    }
+
     //身份
     @Override
     public Object getPrincipal() {
@@ -56,4 +64,12 @@ public class BaseToken implements AuthenticationToken {
     public void setLanguageCode(String languageCode) {
         this.languageCode = languageCode;
     }
+
+    public Integer getLoginPlatform() {
+        return loginPlatform;
+    }
+
+    public void setLoginPlatform(Integer loginPlatform) {
+        this.loginPlatform = loginPlatform;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java

@@ -12,4 +12,8 @@ public class SaAdminToken extends BaseToken {
     public SaAdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public SaAdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java

@@ -12,4 +12,8 @@ public class UserToken extends BaseToken {
     public UserToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -16,8 +16,6 @@ import java.util.List;
 @Data
 public class SessionUser implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiParam("用户ID")
     private Long userId;
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java

@@ -43,6 +43,14 @@ public class SysFile extends BaseBean {
     @ApiParam(value ="文件所属模块")
     private Integer fileSoftType;
 
+    public int getFileSoftTypeVal(){
+        if(fileSoftType == null){
+            return 0;
+        }
+
+        return fileSoftType.intValue();
+    }
+
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -83,5 +91,4 @@ public class SysFile extends BaseBean {
     @Column(name="DOWNLOAD_NUM")
     @ApiParam(value ="下载次数" , example ="0")
     private Integer downloadNum;
-
 }

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

@@ -90,4 +90,12 @@ public class WmsBom extends BaseBean {
     public Double getItemQty() {
         return this.itemQty == null ? 0 : this.itemQty.doubleValue();
     }
+
+    public WmsBom(){}
+    public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) {
+        this.itemPartNo = itemPartNo;
+        this.itemPartNam = itemPartNam;
+        this.itemUnit = itemUnit;
+        this.bomNum = bomNum;
+    }
 }

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

@@ -58,7 +58,7 @@ public class WmsDocFgDetail extends BaseBean {
     public String partNo;
 
     @Column(name="PART_NAME_RDD")
-    @ApiParam("单位")
+    @ApiParam("物料名称")
     public String partNameRdd;
 
     @Column(name="BOM_UPDATE")
@@ -123,4 +123,8 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="IS_LOCK")
     @ApiParam(value = "是否锁定", example = "2")
     public Integer isLock;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String remark;
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -148,9 +149,9 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("交易类型")
     public Integer busiTypeCode;
 
-    @Column(name = "IS_SYNC")
+    @Column(name = "IS_SYNC", nullable = false)
     @ApiParam("是否同步")
-    public Integer isSync;
+    public Integer isSync = CommonEnumUtil.FALSE;
 
     @ApiParam(value = "待出库数量", example = "0")
     @Transient

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 = "客户编码")
@@ -151,6 +151,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "客户条码")
     private String custSn;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;

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

@@ -25,21 +25,32 @@ public class WmsMoveUnfinishedOrderModel extends  BaseBean{
     @ApiParam("未完成数量")
     private Double destQty;
 
-    @ApiParam("业务类型")
+
-    private Integer busiTypeCode;
 
     @ApiParam("交易类型")
     private String transTypeCode;
 
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
     @ApiParam("关联单号")
     private String refSrc;
 
-    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
+    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.refSrc = refSrc;
+    }
+
+    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode,  String refSrc) {
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
-        this.busiTypeCode = busiTypeCode;
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }

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