purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化用户和单据模块

Browse Source
This commit is contained in:
季圣华
2019-12-25 22:46:37 +08:00
parent 8cfdc3dc17
commit b9fb7e2c8c
10 changed files with 997 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View File

@@ -13,7 +13,7 @@ public class DepotHeadExample {
protected List<Criteria> oredCriteria;
public DepotHeadExample() {
oredCriteria = new ArrayList<Criteria>();
oredCriteria = new ArrayList<>();
}
public void setOrderByClause(String orderByClause) {
@@ -70,7 +70,7 @@ public class DepotHeadExample {
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -2118,7 +2118,6 @@ public class DepotHeadExample {
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}

5
src/main/java/com/jsh/erp/datasource/entities/UserExample.java
View File

@@ -11,7 +11,7 @@ public class UserExample {
protected List<Criteria> oredCriteria;
public UserExample() {
oredCriteria = new ArrayList<Criteria>();
oredCriteria = new ArrayList<>();
}
public void setOrderByClause(String orderByClause) {
@@ -68,7 +68,7 @@ public class UserExample {
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -1036,7 +1036,6 @@ public class UserExample {
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}

2
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View File

@@ -6,7 +6,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DepotHeadMapper {
int countByExample(DepotHeadExample example);
long countByExample(DepotHeadExample example);
int deleteByExample(DepotHeadExample example);

2
src/main/java/com/jsh/erp/datasource/mappers/UserMapper.java
View File

@@ -6,7 +6,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface UserMapper {
int countByExample(UserExample example);
long countByExample(UserExample example);
int deleteByExample(UserExample example);

16
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -464,8 +464,6 @@ public class DepotHeadService {
}
/**
* create by: cjl
* description:
* 新增单据主表及单据子表信息
* create time: 2019/1/25 14:36
* @Param: beanJson
@@ -493,15 +491,21 @@ public class DepotHeadService {
}catch(Exception e){
JshException.writeFail(logger, e);
}
/**入库和出库处理预付款信息*/
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
if(depotHead.getOrganid()!=null) {
supplierService.updateAdvanceIn(depotHead.getOrganid(), BigDecimal.ZERO.subtract(depotHead.getTotalprice()));
}
}
/**入库和出库处理单据子表信息*/
depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId(),tenantId, request);
//根据单据编号查询单据id
DepotHeadExample dhExample = new DepotHeadExample();
dhExample.createCriteria().andDefaultnumberEqualTo(depotHead.getDefaultnumber()).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<DepotHead> list = depotHeadMapper.selectByExample(dhExample);
if(list!=null) {
Long headId = list.get(0).getId();
/**入库和出库处理单据子表信息*/
depotItemService.saveDetials(inserted,deleted,updated,headId,tenantId, request);
}
/**如果关联单据号非空则更新订单的状态为2 */
if(depotHead.getLinknumber()!=null) {
DepotHead depotHeadOrders = new DepotHead();
@@ -516,8 +520,6 @@ public class DepotHeadService {
}
}
/**
* create by: cjl
* description:
* 更新单据主表及单据子表信息
* create time: 2019/1/28 14:47
* @Param: id

10
src/main/java/com/jsh/erp/service/user/UserService.java
View File

@@ -334,8 +334,14 @@ public class UserService {
OrgaUserRel oul=new OrgaUserRel();
//机构id
oul.setOrgaId(ue.getOrgaId());
//用户id
oul.setUserId(ue.getId());
//用户id，根据用户名查询id
UserExample example = new UserExample();
example.createCriteria().andLoginameEqualTo(ue.getLoginame());
List<User> list = userMapper.selectByExample(example);
if(list!=null) {
Long userId = list.get(0).getId();
oul.setUserId(userId);
}
//用户在机构中的排序
oul.setUserBlngOrgaDsplSeq(ue.getUserBlngOrgaDsplSeq());