From 81d6f86eb051308d874fe28785f6505d727d1676 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Tue, 27 May 2025 23:46:46 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=BB=99=E5=8D=95=E6=8D=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=BC=80=E7=A5=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3335590c --- .../com/jsh/erp/constants/BusinessConstants.java | 7 ------- .../jsh/erp/datasource/vo/DepotHeadVo4List.java | 13 ------------- .../com/jsh/erp/service/DepotHeadService.java | 16 ---------------- 3 files changed, 36 deletions(-) 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,