申购添加商品名称等字段

test
anthonywj 1 year ago
parent e192f70aba
commit b1ece4dbc6

@ -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<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);

@ -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;
}

@ -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:

@ -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

Loading…
Cancel
Save