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

给单据去掉多余的代码

Browse Source
This commit is contained in:
jishenghua
2025-02-25 23:14:33 +08:00
parent 828fc537e3
commit e318375226
6 changed files with 1 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java
View File

@@ -27,21 +27,6 @@ public interface AccountHeadMapperEx {
@Param("number") String number,
@Param("inOutItemId") Long inOutItemId);
Long countsByAccountHead(
@Param("type") String type,
@Param("creatorArray") String[] creatorArray,
@Param("billNo") String billNo,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("organId") Long organId,
@Param("creator") Long creator,
@Param("handsPersonId") Long handsPersonId,
@Param("accountId") Long accountId,
@Param("status") String status,
@Param("remark") String remark,
@Param("number") String number,
@Param("inOutItemId") Long inOutItemId);
List<AccountHeadVo4ListEx> getDetailByNumber(
@Param("billNo") String billNo);

21
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -36,27 +36,6 @@ public interface DepotHeadMapperEx {
@Param("accountId") Long accountId,
@Param("remark") String remark);
Long countsByDepotHead(
@Param("type") String type,
@Param("subType") String subType,
@Param("creatorArray") String[] creatorArray,
@Param("hasDebt") String hasDebt,
@Param("statusArray") String[] statusArray,
@Param("purchaseStatusArray") String[] purchaseStatusArray,
@Param("number") String number,
@Param("linkApply") String linkApply,
@Param("linkNumber") String linkNumber,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("materialParam") String materialParam,
@Param("organId") Long organId,
@Param("organArray") String[] organArray,
@Param("creator") Long creator,
@Param("depotId") Long depotId,
@Param("depotArray") String[] depotArray,
@Param("accountId") Long accountId,
@Param("remark") String remark);
List<MaterialsListVo> findMaterialsListMapByHeaderIdList(
@Param("idList") List<Long> idList);

18
jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java
View File

@@ -130,28 +130,12 @@ public class AccountHeadService {
return list;
}
public Long countAccountHead(String type, String billNo, String beginTime, String endTime,
Long organId, Long creator, Long handsPersonId, Long accountId, String status,
String remark, String number, Long inOutItemId) throws Exception{
Long result=null;
try{
String [] creatorArray = getCreatorArray();
beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo,
beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number, inOutItemId);
} catch(Exception e){
JshException.readFail(logger, e);
}
return result;
}
/**
* 根据角色类型获取操作员数组
* @return
* @throws Exception
*/
private String[] getCreatorArray() throws Exception {
public String[] getCreatorArray() throws Exception {
String creator = "";
User user = userService.getCurrentUser();
String roleType = userService.getRoleTypeByUserId(user.getId()).getType(); //角色类型

22
jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java
View File

@@ -216,28 +216,6 @@ public class DepotHeadService {
return list;
}
public Long countDepotHead(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber,
String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark) throws Exception{
Long result=null;
try{
String [] depotArray = getDepotArray(subType);
String [] creatorArray = getCreatorArray();
String [] statusArray = StringUtil.isNotEmpty(status) ? status.split(",") : null;
String [] purchaseStatusArray = StringUtil.isNotEmpty(purchaseStatus) ? purchaseStatus.split(",") : null;
String [] organArray = getOrganArray(subType, purchaseStatus);
//以销定购，查看全部数据
creatorArray = StringUtil.isNotEmpty(purchaseStatus) ? null: creatorArray;
beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, hasDebt,
statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime,
materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark);
} catch(Exception e){
JshException.readFail(logger, e);
}
return result;
}
/**
* 根据单据类型获取仓库数组
* @param subType