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

Revert "给单据列表接口返回是否需要开票的字段"

Browse Source 
This reverts commit 3335590c
This commit is contained in:
jishenghua
2025-05-27 23:46:46 +08:00
parent 5f265b5b97
commit 81d6f86eb0
3 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java
View File

@@ -213,13 +213,6 @@ public class BusinessConstants {
public static final String ROLE_TYPE_PUBLIC = "全部数据"; public static final String ROLE_TYPE_PUBLIC = "全部数据";
/**
* 是否需要开票
*/
public static final String NO_NEED = "不需要";
public static final String NEED_GENERAL = "需要普票";
public static final String NEED_SPECIAL = "需要专票";
/** /**
* redis相关 * redis相关
* */ * */

13
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View File

@@ -57,11 +57,6 @@ public class DepotHeadVo4List extends DepotHead{
*/ */
private BigDecimal realNeedDebt; private BigDecimal realNeedDebt;
/**
* 是否需要开票
*/
private String needInvoiceStr;
public String getProjectName() { public String getProjectName() {
return projectName; return projectName;
} }
@@ -229,12 +224,4 @@ public class DepotHeadVo4List extends DepotHead{
public void setRealNeedDebt(BigDecimal realNeedDebt) { public void setRealNeedDebt(BigDecimal realNeedDebt) {
this.realNeedDebt = realNeedDebt; this.realNeedDebt = realNeedDebt;
} }
public String getNeedInvoiceStr() {
return needInvoiceStr;
}
public void setNeedInvoiceStr(String needInvoiceStr) {
this.needInvoiceStr = needInvoiceStr;
}
} }

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

@@ -202,10 +202,6 @@ public class DepotHeadService {
if(materialCountListMap!=null) { if(materialCountListMap!=null) {
dh.setMaterialCount(materialCountListMap.get(dh.getId())); dh.setMaterialCount(materialCountListMap.get(dh.getId()));
} }
//是否需要开票
if(StringUtil.isNotEmpty(dh.getNeedInvoice())) {
dh.setNeedInvoiceStr(parseNeedInvoice(dh.getNeedInvoice()));
}
//以销定购的情况（不能显示销售单据的金额和客户名称） //以销定购的情况（不能显示销售单据的金额和客户名称）
if(StringUtil.isNotEmpty(purchaseStatus)) { if(StringUtil.isNotEmpty(purchaseStatus)) {
dh.setOrganName("****"); dh.setOrganName("****");
@@ -747,18 +743,6 @@ public class DepotHeadService {
return materialCountListMap; return materialCountListMap;
} }
public String parseNeedInvoice(String needInvoice) {
if("0".equals(needInvoice)) {
return BusinessConstants.NO_NEED;
} else if("1".equals(needInvoice)) {
return BusinessConstants.NEED_GENERAL;
} else if("2".equals(needInvoice)) {
return BusinessConstants.NEED_SPECIAL;
} else {
return BusinessConstants.NO_NEED;
}
}
public List<DepotHeadVo4InDetail> findInOutDetail(String beginTime, String endTime, String type, String[] creatorArray, public List<DepotHeadVo4InDetail> findInOutDetail(String beginTime, String endTime, String type, String[] creatorArray,
String[] organArray, List<Long> categoryList, Boolean forceFlag, Boolean inOutManageFlag, String[] organArray, List<Long> categoryList, Boolean forceFlag, Boolean inOutManageFlag,
String materialParam, List<Long> depotList, Integer oId, String number, String materialParam, List<Long> depotList, Integer oId, String number,