From 133f841b7cd42a4500bc0439f67373420074eabc Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 6 Jul 2023 11:24:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?UdiRelevanceResponse=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BBcount=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 4d588f774..23fa63ee6 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -123,7 +123,7 @@ public class UdiRelevanceResponse { private String syqsfxyjxmj; private String mjfs; private String categoryName; - private int count; + private Integer count; private Long deId; From e20a65a00cb0818ab5f26847e8c0587edbdb93d1 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Thu, 6 Jul 2023 14:29:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97=E5=88=B0=E5=BE=85=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E4=BC=9A=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/inout/IoOrderController.java | 2 +- src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java | 2 ++ src/main/resources/mybatis/mapper/auth/SysMenuDao.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 41aaa7365..c98143e4d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -241,7 +241,7 @@ public class IoOrderController extends BaseController { return ResultVOUtils.error(500, "单据未扫码或扫码校验无法通过,提交失败,请检查后重新提交！"); } IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); - + orderEntity.setRemark(addOrderRequest.getRemark()); BaseResponse tempResponse = checkSubmitEnable(orderEntity); if (tempResponse != null) return tempResponse; diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java index 7012b514c..5ab80ef06 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java @@ -120,5 +120,7 @@ public class IoCodeTempResponse { * 供应商名称 */ private String supName; + private String remark; + } diff --git a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml index 63e4d220b..901aae348 100644 --- a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +