日志查询增加出入库详细类型。修改密码bug修改。

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -80,6 +80,19 @@ public class TaskController {
             finished=true;
             finished=true;
         }
         }
 
 
+        if(criteria.getInoutType()!=null){
+            int inoutType=criteria.getInoutType();
+            if(inoutType>=100){
+                criteria.setType(2);
+                criteria.setOutType(inoutType-100);
+                criteria.setInType(null);
+            }else{
+                criteria.setType(1);
+                criteria.setInType(inoutType);
+                criteria.setOutType(null);
+            }
+        }
+
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         if (unEnd) {
         if (unEnd) {
             query.addCriteria(Criteria.where("status").nin(OP_STATUS.END.name(), OP_STATUS.FINISHED.name()));
             query.addCriteria(Criteria.where("status").nin(OP_STATUS.END.name(), OP_STATUS.FINISHED.name()));

src/main/java/com/neotel/smfcore/core/system/rest/bean/query/TaskQueryCondition.java

@@ -40,8 +40,28 @@ public class TaskQueryCondition {
     @QueryCondition
     @QueryCondition
     @ApiModelProperty("出入库类型")
     @ApiModelProperty("出入库类型")
     private Integer type;
     private Integer type;
+    /**
+     * 入库类型：1=普通入库，2=并盘入库，3=截料入库，4=退料入库
+     */
+    @QueryCondition
+    @ApiModelProperty("入库类型")
+    private Integer inType;
+    /**
+     * 出库类型:0普通出库,1并盘出库 ,2湿敏出库 3线边仓间转储出库 ,10=工单出库
+     * 4=转外协出库,发运单出库,成本中心领料:对应4，预留单出库;
+     */
+    @QueryCondition
+    @ApiModelProperty("出库类型")
+
+    private Integer outType;
     @ApiModelProperty("分组ID")
     @ApiModelProperty("分组ID")
     private String groupId;
     private String groupId;
     @ApiModelProperty("CID数组")
     @ApiModelProperty("CID数组")
     private String[] cids;
     private String[] cids;
+
+
+    @ApiModelProperty("出入库类型")
+    private Integer inoutType;
+
+
 }
 }

src/main/java/com/neotel/smfcore/security/service/manager/impl/UserManagerImpl.java

@@ -53,7 +53,7 @@ public class UserManagerImpl implements IUserManager {
     public void updatePass(String username, String encryptPassword) {
     public void updatePass(String username, String encryptPassword) {
         Criteria c = Criteria.where("username").is(username);
         Criteria c = Criteria.where("username").is(username);
         Query query = Query.query(c);
         Query query = Query.query(c);
-        Update update = Update.update("password",encryptPassword).addToSet("pwdResetTime",new Date());
+        Update update = Update.update("password",encryptPassword).set("pwdResetTime",new Date());
         userDao.updateFirst(query,update);
         userDao.updateFirst(query,update);
     }
     }
     @Override
     @Override