UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

长泰接口修改；平潭核算分类修改

Browse Source
dev
anthonywj 1 year ago
parent be5b79cbb1
commit 4b590f1e33
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File

59
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -431,7 +431,7 @@ public class CtqyyClient extends CommonHttpClient {
if (StrUtil.isBlank(thrSystemBusApiEntity.getUrl())) {
// return ResultVOUtils.error(500, "接口未配置，无法提交！");
}
zaxzyyOrderRequest.setOperUser(getUserName(orderEntity));
zaxzyyOrderRequest.setThirdSys(getUserName(orderEntity));
zaxzyyOrderRequest.setBillType(thrSystemBusApiEntity.getThirdBuyCode());
zaxzyyOrderRequest.setBillFlag("1");
@ -536,6 +536,7 @@ public class CtqyyClient extends CommonHttpClient {
fprq = DateUtil.formatDateTime(invoiceList.get(0).getInvoiceDate());
}
i.setFirstSalesInvNo(fphm);
i.setSecSalesInvNo(fphm);
i.setInvoiceDate(fprq);
}
//构造诏安接口参数
@ -587,33 +588,35 @@ public class CtqyyClient extends CommonHttpClient {
public String getUserName(IoOrderEntity orderEntity) {
String userName = null;
//创建人非供应商
if (StrUtil.isNotEmpty(orderEntity.getCheckUser())) {
AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser());
if (authUserEntity == null)
userName = null;
userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
} else if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) {
AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser());
userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
} else if (StrUtil.isNotEmpty(orderEntity.getCreateUser()) && orderEntity.getCreateUser().length() != 14) {
AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCreateUser());
userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
} else if (StrUtil.isNotEmpty(orderEntity.getUpdateUser()) && orderEntity.getUpdateUser().length() != 14) {
AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getUpdateUser());
userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
}
if (userName == null) {
List<AuthWarehouseUser> authWarehouseUsers = authWarehouseUserMapper.selectList(new QueryWrapper<AuthWarehouseUser>().eq("code", orderEntity.getInvCode()));
if (CollUtil.isNotEmpty(authWarehouseUsers)) {
AuthWarehouseUser authWarehouseUser = authWarehouseUsers.get(0);
AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser());
userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
return userName;
}
}
return userName;
return "黄跃祥/177";
// String userName = null;
// //创建人非供应商
// if (StrUtil.isNotEmpty(orderEntity.getCheckUser())) {
// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser());
// if (authUserEntity == null)
// userName = null;
// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
// } else if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) {
// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser());
// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
// } else if (StrUtil.isNotEmpty(orderEntity.getCreateUser()) && orderEntity.getCreateUser().length() != 14) {
// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCreateUser());
// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
// } else if (StrUtil.isNotEmpty(orderEntity.getUpdateUser()) && orderEntity.getUpdateUser().length() != 14) {
// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getUpdateUser());
// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
// }
// if (userName == null) {
// List<AuthWarehouseUser> authWarehouseUsers = authWarehouseUserMapper.selectList(new QueryWrapper<AuthWarehouseUser>().eq("code", orderEntity.getInvCode()));
// if (CollUtil.isNotEmpty(authWarehouseUsers)) {
// AuthWarehouseUser authWarehouseUser = authWarehouseUsers.get(0);
// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser());
// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
// return userName;
// }
// }
// return userName;
}

3
src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java
Unescape Escape View File

@ -272,7 +272,8 @@ public class PtxhyyClient extends CommonHttpClient {
.lsjg(i.getPrice() + "")
.lsje(wzje)
.wzje(wzje + "")
.hsfl(hsfl)
.hsfl(i.getCplb())
// .hsfl(hsfl)
.wzph(i.getBatchNo())
.fphm(fphm)
.fprq(fprq)

Write Preview
Loading…
Cancel
Save