Merge remote-tracking branch 'origin/master'

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -72,26 +72,6 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public int deleteByProperties(String[] propNames, Object[] objValues);
 
     /**
-     * 弱删除
-     * @return count
-     */
-    public int deleteWeaklyById(ID id);
-    public int deleteWeaklyByIds(Long[] ids) ;
-    public int deleteWeaklyByProperty(String propName, Object propValue);
-    public int deleteWeaklyByPropertyIn(String propName, Object[] propValues);
-    public int deleteWeaklyByProperties(String[] propNames, Object[] objValues);
-
-    /**
-     * 更新有效无效状态
-     * @return count
-     */
-    public int updateValidStatusById(ID id,int status);
-    public int updateValidStatusByIds(Long[] ids,int status) ;
-    public int updateValidStatusByProperty(String propName, Object propValue,int status);
-    public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status);
-    public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status);
-
-    /**
      * 通过多单属性进行单个值更新
      * @param conditionName
      * @param conditionValue
@@ -235,4 +215,26 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public List<Object[]> findBySqlObjList(String sql);
 
     public List<Object[]> findBySqlObjListByPager(String sql,Pager pager);
+
+    /****************** 部分业务处理 *******************/
+
+    /**
+     * 弱删除
+     * @return count
+     */
+    public int deleteWeaklyById(ID id,String username);
+    public int deleteWeaklyByIds(Long[] ids,String username) ;
+    public int deleteWeaklyByProperty(String propName, Object propValue,String username);
+    public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username);
+    public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username);
+
+    /**
+     * 更新有效无效状态
+     * @return count
+     */
+    public int updateValidStatusById(ID id,int status,String username);
+    public int updateValidStatusByIds(Long[] ids,int status,String username) ;
+    public int updateValidStatusByProperty(String propName, Object propValue,int status,String username);
+    public int updateValidStatusByPropertyIn(String propName, Object[] propValues,int status,String username);
+    public int updateValidStatusByProperties(String[] propNames, Object[] objValues,int status,String username);
 }

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

@@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.util.prefs.BackingStoreException;
 
 /**
  * @Description : 供应商

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-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;
@@ -14,7 +12,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :
+ * @Description :物料实体
  * @Reference :
  * @Author : dragon.xu
  * @CreateDate : 2018-11-07 16:06
@@ -65,7 +63,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name="ABC")
     @ApiParam(value ="分类")
-    private String ABC;
+    private String abc;
 
     @Column(name="BUY_UNIT")
     @ApiParam(value ="采购单位")

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

@@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
 import org.springframework.stereotype.Repository;
 /**
-* @Description :
+* @Description :物料Repository的方法接口
 * @Reference :
 * @Author : dragon.xu
 * @CreateDate : 2018-11-08 10:19

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

@@ -1,11 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
-import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
-import cn.estsh.i3plus.pojo.wms.bean.WmsTrans;
-import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
 
 /**
  * @Description : 仓库管理对象封装
@@ -15,7 +11,23 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
  * @Modify:
  **/
 public class WmsHqlPack {
-
+    /**
+     * 物料查询条件封装
+     *
+     * @param wmsPart
+     * @return
+     */
+    public static String packHqlWmsPart(WmsPart wmsPart) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
+        HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDateTime", result, true);
+        HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
+        HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
+        HqlPack.getStringLikerPack(wmsPart.getAbc(), "ABC", result);
+        HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result);
+        HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result);
+        return result.toString();
+    }
     /**
      * 抽点比例信息 分页查询
      * @param wmsIbCheckPlan
@@ -170,12 +182,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result);
         HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
         HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
-        // 默认有效
-        if(wareHouse.getIsValid()==null){
-            HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",result);
-        }else{
-            HqlPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.INVAILD.getValue()+"","isValid",result);
-        }
+        HqlPack.getNumEqualPack(wareHouse.getIsValid(),"isValid",result);
         return result.toString();
     }