diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 006817d8..e7d38bb9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -121,8 +121,8 @@ public class PurApplyController { if (purApplyRequest.getStatus() == null) { purApplyRequest.setStatus(11); //查询未审核和草稿状态 } - if(purApplyRequest.getIsUser() != null && purApplyRequest.getIsUser()){ - AuthAdmin authAdmin=customerService.getUserBean(); + if (purApplyRequest.getIsUser() != null && purApplyRequest.getIsUser()) { + AuthAdmin authAdmin = customerService.getUserBean(); purApplyRequest.setCreateUser(authAdmin.getId() + ""); //查询自己 } @@ -146,8 +146,8 @@ public class PurApplyController { if (purApplyRequest.getStatus() == null) { purApplyRequest.setStatus(10); //查询未审核和已审核状态 } - if(purApplyRequest.getIsInvCode()!=null && purApplyRequest.getIsInvCode()){ - AuthAdmin authAdmin=customerService.getUserBean(); + if (purApplyRequest.getIsInvCode() != null && purApplyRequest.getIsInvCode()) { + AuthAdmin authAdmin = customerService.getUserBean(); purApplyRequest.setTargetInvCode(authAdmin.getLocInvCode() + ""); //查询自己仓库 } List purApplyEntities = purApplyService.queryPageList(purApplyRequest); diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java index faf3ae11..f84008d1 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java @@ -48,10 +48,12 @@ public class PurOrderDetailResponse { private int acceptCount; private String measname; private String supId; -//供应商 + //供应商 private String supName; -//采购单号 + //采购单号 private String billNo; private String nameCode; + + private String spmc; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d3ec63ec..b2df4abe 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_zyy?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_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index 74529845..e94bfd1b 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -27,6 +27,7 @@ basic_products.measname, basic_products.manufactory, basic_products.ylqxzcrbarmc, + basic_products.spmc, basic_corp.`name` supName FROM pur_apply_detail INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id