From eb48e66a362556b2292085ce4c34034f1b5144be Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 12 Jul 2023 09:52:00 +0800 Subject: [PATCH 01/10] =?UTF-8?q?int=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java | 2 +- src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java index 5b759e50..8bafcc5d 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java @@ -140,7 +140,7 @@ public class IoCodeEntity implements Serializable { private Date createTime; @TableField(exist = false) - private int status; //条码校验状态 + private int status; //条码校验状态//条码校验状态(数据类型请勿修改） @TableField(exist = false) private int scanCount; diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java index 2d0c9c30..4c661f2f 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java @@ -137,7 +137,7 @@ public class IoCodeTempEntity { private Date createTime; @TableField(exist = false) - private Integer status; //条码校验状态 + private int status; //条码校验状态(数据类型请勿修改） @TableField(exist = false) private String mySupId; //更新供应商 From 48d0bc83506397d394dc3acf342f48df61ccfd52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 12 Jul 2023 16:09:32 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E4=B8=89=E6=9C=9F=E6=A0=A1=E9=AA=8C=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=89=AB=E7=A0=81=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index c70ea590..a0025223 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -963,7 +963,9 @@ public class IoCodeTempController extends BaseController { for (int i = 0; i < codeEnttityList.size(); i++) { IoCodeTempEntity drugCodeSelectEntity = codeEnttityList.get(i); if (codeEnttityList.get(i).getCode().equals(code)) { - return drugCodeSelectEntity; + if (StrUtil.emptyIfNull(drugCodeSelectEntity.getSerialNo()).equals(StrUtil.emptyIfNull(udiEntity.getSerialNo()))) { + return drugCodeSelectEntity; + } } // UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode()); if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) { From 22f96a53e9a21812c20cf1194ed066ebec8bb23a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 12 Jul 2023 16:32:56 +0800 Subject: [PATCH 03/10] =?UTF-8?q?UDI=E7=A0=81=E8=BF=BD=E6=BA=AF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 8920fc30..66116270 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -86,7 +86,7 @@ basic_corp.creditNo, io.action, io.fromInvCode, - bbt.corpType + bbt.corpType,iodr.reCount count from io_order_detail_result iodr INNER JOIN io_order io on iodr.orderIdFk = io.billNo left join basic_corp on io.fromCorp = basic_corp.erpId From 0f1d57bcfa35dfea251c814ef29330e9d64c10e6 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Thu, 13 Jul 2023 10:50:01 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/purchase/SupCompanyController.java | 1 + .../api/service/purchase/impl/SupCompanyServiceImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index e908908d..394debcb 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -81,6 +81,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @GetMapping("/api/pur/getSupComapnys") public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) { + System.out.println(companyRequest.toString()); List companyEntities = companyService.filterCompany(companyRequest); PageInfo pageInfo = new PageInfo<>(companyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index d9554d6b..c8936902 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -36,9 +36,8 @@ public class SupCompanyServiceImpl extends ServiceImpl Date: Thu, 13 Jul 2023 15:00:22 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E5=85=A7=E7=B6=B2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99GS1=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 6 +++++- .../api/controller/sync/SpsSyncExportStatusController.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index a0025223..0c739ee6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -349,7 +349,11 @@ public class IoCodeTempController extends BaseController { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode()); String code = addOrderRequest.getCode(); - if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR); + if (StringUtils.isBlank(code)) + return ResultVOUtils.error(ResultEnum.DATA_ERROR); + if (code.endsWith("\u001D")) { + code = code.replace("\u001D", ""); + } UdiEntity udiEntity = FilterUdiUtils.getUdi(code); if (udiEntity == null) return ResultVOUtils.error(500, "无效条码！"); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 14de0022..08df61ee 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -28,6 +28,7 @@ import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.task.TaskExecutorConfig; import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; import com.glxp.api.util.RedisUtil; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -230,7 +231,7 @@ public class SpsSyncExportStatusController { @PostMapping("/spssync/basic/schedule/updateLastTime") @Log(title = "定时任务", businessType = BusinessType.UPDATE) public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { - + basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date())); boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); if (b) return ResultVOUtils.success("更新成功！"); From 52e7c1432848d805e6a0f4daaf4ee17ec362e790 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 13 Jul 2023 19:52:16 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=AF=84=E5=94=AE=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E8=A1=A5=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 2 +- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 5 ++++- src/main/resources/application-dev.yml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 3562d89f..771ce485 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -231,7 +231,7 @@ public class IoOrderResponse { private Integer deliveryStatus; private Integer processStatus; - private int inCodeStatus; + private Integer inCodeStatus; private Integer allCout; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index b4bd9bf4..8547e608 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -41,8 +41,10 @@ import com.glxp.api.service.inout.*; import com.glxp.api.service.inv.*; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.util.DateUtil; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -588,7 +590,7 @@ public class IoOrderServiceImpl implements IoOrderService { && StrUtil.isEmpty(orderEntity.getSupplementNo()) ) { if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) { - if (orderEntity.getOutChangeEnable()) { + if (IntUtil.value(orderEntity.getOutChangeEnable())) { response.setEnableSupplementOrder(true); } } else @@ -597,6 +599,7 @@ public class IoOrderServiceImpl implements IoOrderService { result.add(response); } catch (Exception e) { e.printStackTrace(); + log.error(ExceptionUtils.getStackTrace(e)); log.error(orderEntity.getBillNo() + "平衡补单出错\n"); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 49e15b9b..498c0745 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_zzzyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60 From 256ea64d2546766dc4349b7b644feede80892f9a Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Fri, 14 Jul 2023 09:37:52 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=20=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BF=A1=E6=81=AF=E6=97=B6=E6=8F=90=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/dao/inout/IoOrderDao.java | 2 ++ .../service/inv/impl/InvPreInProductDetailServiceImpl.java | 7 ++++++- src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index ad9882b8..f4f1f963 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -63,4 +63,6 @@ public interface IoOrderDao extends BaseMapperPlus().select("createTime").eq("billNo", response.getOrderId())); - response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + if (order!=null){ + response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + } + +// response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss")); } @Override diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 9ef6ab5e..a1351221 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -556,4 +556,6 @@ + + From 58bd268f47d2f2d1eca4a42ee1732cef2bde8606 Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Fri, 14 Jul 2023 09:54:29 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=20=E5=B0=86=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E7=A6=81=E7=94=A8=E5=90=8E=E8=BF=98=E8=83=BD=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/sup/CustomerController.java | 4 ++++ src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sup/CustomerController.java b/src/main/java/com/glxp/api/controller/sup/CustomerController.java index 6c301b06..393b260d 100644 --- a/src/main/java/com/glxp/api/controller/sup/CustomerController.java +++ b/src/main/java/com/glxp/api/controller/sup/CustomerController.java @@ -113,6 +113,10 @@ public class CustomerController { List objects = new ArrayList<>(); if( byCustomerld !=null && byCustomerld.size()>0){ for (AuthAdmin authAdmin : byCustomerld) { + //修改关联的用户状态 + authAdmin.setUserFlag(customerDetailEntity.getUserFlag()); + authAdminService.updateAuthAdmin(authAdmin); + List authRoleAdmins = authRoleAdminService.listByAdminId(authAdmin.getId()); if(authRoleAdmins!=null && authRoleAdmins.size()>0) { authRoleAdmin.setRole_id(Long.valueOf(customerDetailEntity.getRoleId())); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index fb988c1e..6993ad14 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -509,7 +509,6 @@ basic_products.sfwblztlcp, basic_products.cgzmraqxgxx, basic_products.sfbjwycxsy, - basic_products.zdcfsycs, basic_products.sfwwjbz, basic_products.syqsfxyjxmj, basic_products.mjfs, From 1fe4597caf9fd48041ff87ecc916a0016a5e8968 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 14 Jul 2023 09:57:00 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8D=E8=A1=A5?= =?UTF-8?q?=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/sync/SpsSyncDownloadController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 898c5880..c042867d 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -640,7 +640,7 @@ public class SpsSyncDownloadController { List orderEntities = syncDataResponse.getOrderEntities(); for (IoOrderEntity orderEntity : orderEntities) { - SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2); + SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 1); orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST); From 4924f0b723dbac840a38e42216cb936784ceb18b Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Fri, 14 Jul 2023 16:11:18 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=8F=91=E7=A5=A8-=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=20=E9=A1=B5=E9=9D=A2=EF=BC=8CDI/=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E7=BC=96=E7=A0=81=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java | 1 + .../java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java | 1 + .../resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java index 430de6ec..84a2ae7b 100644 --- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java @@ -27,6 +27,7 @@ public class IoOrderInvoiceRequest extends ListPageRequest { private String machineNo; + private String nameCode; private String invoiceCode; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java index defce740..0f5606fd 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java @@ -94,6 +94,7 @@ public class IoOrderInvoiceResponse { private String measname; private String manufacturer; private String certCode; + private String nameCode; private int reCount; private int count; private BigDecimal amout; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml index 277671b6..e18f6660 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml @@ -62,7 +62,8 @@ io.manufacturer, io.certCode, io.reCount, - io.count + io.count, + io.nameCode FROM io_order_invoice ic INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk LEFT JOIN basic_udirel bu @@ -90,6 +91,7 @@