From 587b2a64372e68108de5b97fb8aae55281e13c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 24 Nov 2023 13:51:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=9F=A5=E9=AA=8C=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E8=AF=A6=E8=A7=81=E9=94=80=E8=B4=A7=E6=B8=85=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index f5bf6160..e3a35035 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -441,6 +441,14 @@ public class SDNYMainProcessController extends AbstractController { map.put("taxRate", "0.00"); } } + JSONArray invoiceLineList = checkInvoiceResult.getJSONArray("invoiceLineList"); + for (int i = 0; i < invoiceLineList.size(); i++) { + JSONObject detail = invoiceLineList.getJSONObject(i); + String commodityName = detail.getString("commodityName"); + if (StringUtils.isNotBlank(commodityName) && commodityName.contains("(详见销货清单)")){ + invoiceLineList.remove(i); + } + } data.put("data", checkInvoiceResult); return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -679,6 +687,15 @@ public class SDNYMainProcessController extends AbstractController { map.put("taxRate", "0.00"); } } + + JSONArray invoiceLineList = checkInvoiceResult.getJSONArray("invoiceLineList"); + for (int i = 0; i < invoiceLineList.size(); i++) { + JSONObject detail = invoiceLineList.getJSONObject(i); + String commodityName = detail.getString("commodityName"); + if (StringUtils.isNotBlank(commodityName) && "(详见销货清单)".equals(commodityName)){ + invoiceLineList.remove(i); + } + } data.put("data", checkInvoiceResult); return ResponseEntity.ok(JSONObject.toJSONString(data)); From d35b500d4e2bc2ea260f684ca9dfa5726a78de24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 1 Dec 2023 16:29:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BA=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E7=8A=B6=E6=80=81=E4=B8=BA6=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index d37d8305..c2996927 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -130,7 +130,7 @@ and t.qs_status = #{qszt} - and t.auth_status = #{rzzt} + and t.auth_status in ('1','2') and (t.auth_status = '2' or t.auth_status = '3') @@ -452,7 +452,7 @@ and t.qs_status = #{qszt} - and t.auth_status = #{rzzt} + and t.auth_status in ('0','6') and (t.auth_status = '2' or t.auth_status = '3') From aebf0f959fdb6e9f2aa00d8f8272b57bda076881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 8 Dec 2023 16:00:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=83=BD=E5=88=A4=E6=96=AD=E8=AF=A6=E8=A7=81=E9=94=80=E8=B4=A7?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index e3a35035..269cd97a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -445,7 +445,8 @@ public class SDNYMainProcessController extends AbstractController { for (int i = 0; i < invoiceLineList.size(); i++) { JSONObject detail = invoiceLineList.getJSONObject(i); String commodityName = detail.getString("commodityName"); - if (StringUtils.isNotBlank(commodityName) && commodityName.contains("(详见销货清单)")){ + log.info("查验货物名称{}", commodityName); + if (StringUtils.isNotBlank(commodityName) && commodityName.contains("详见销货清单")){ invoiceLineList.remove(i); } } @@ -692,7 +693,8 @@ public class SDNYMainProcessController extends AbstractController { for (int i = 0; i < invoiceLineList.size(); i++) { JSONObject detail = invoiceLineList.getJSONObject(i); String commodityName = detail.getString("commodityName"); - if (StringUtils.isNotBlank(commodityName) && "(详见销货清单)".equals(commodityName)){ + log.info("查验货物名称{}", commodityName); + if (StringUtils.isNotBlank(commodityName) && commodityName.contains("详见销货清单")){ invoiceLineList.remove(i); } } From 5a7ba1e3f5968217def13f0f04d4e989f85c2706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 11 Dec 2023 10:39:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2=E6=92=A4=E9=94=80?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index c2996927..da77c910 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -130,7 +130,7 @@ and t.qs_status = #{qszt} - and t.auth_status in ('1','2') + and t.auth_status in ('1','6') and (t.auth_status = '2' or t.auth_status = '3')