diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java index 8f0bdfc8..08dc19f5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/BusinessConstants.java @@ -213,13 +213,6 @@ public class BusinessConstants { 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相关 * */ diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java index 8bbddf4a..57227b4e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java @@ -57,11 +57,6 @@ public class DepotHeadVo4List extends DepotHead{ */ private BigDecimal realNeedDebt; - /** - * 是否需要开票 - */ - private String needInvoiceStr; - public String getProjectName() { return projectName; } @@ -229,12 +224,4 @@ public class DepotHeadVo4List extends DepotHead{ public void setRealNeedDebt(BigDecimal realNeedDebt) { this.realNeedDebt = realNeedDebt; } - - public String getNeedInvoiceStr() { - return needInvoiceStr; - } - - public void setNeedInvoiceStr(String needInvoiceStr) { - this.needInvoiceStr = needInvoiceStr; - } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java index 9ce78448..59237b9b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java @@ -202,10 +202,6 @@ public class DepotHeadService { if(materialCountListMap!=null) { dh.setMaterialCount(materialCountListMap.get(dh.getId())); } - //是否需要开票 - if(StringUtil.isNotEmpty(dh.getNeedInvoice())) { - dh.setNeedInvoiceStr(parseNeedInvoice(dh.getNeedInvoice())); - } //以销定购的情况(不能显示销售单据的金额和客户名称) if(StringUtil.isNotEmpty(purchaseStatus)) { dh.setOrganName("****"); @@ -747,18 +743,6 @@ public class DepotHeadService { 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 findInOutDetail(String beginTime, String endTime, String type, String[] creatorArray, String[] organArray, List categoryList, Boolean forceFlag, Boolean inOutManageFlag, String materialParam, List depotList, Integer oId, String number,