yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

及时库存表、销售出库单接口调整完善

master
God 3 years ago
parent
7d7058981d
commit
a7d1cf13f5
6 changed files with 15 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmoutbound/ScmOutboundAllVo.java
  2. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmoutbound/ScmOutboundVo.java
  3. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryQuery.java
  4. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/kingdee/KingDeeScmOutboundService.java
  5. 30
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmoutbound/ScmOutboundService.java
  6. 40
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmoutbound/ScmOutboundAllVo.java
View File

@ -58,7 +58,7 @@ public class ScmOutboundAllVo implements Vo {
private String billType; // 单据类型
@ApiModelProperty("发货组织sid")
private String[][] deliverGoodsOrgSid; // 发货组织sid
private String deliverGoodsOrgSid; // 发货组织sid
@ApiModelProperty("发货组织")
private String deliverGoodsOrgName; // 发货组织
@ -94,7 +94,7 @@ public class ScmOutboundAllVo implements Vo {
private String warehouseKeeperName; // 仓管员
@ApiModelProperty("销售组织sid")
private String[][] salesOrgSid; // 销售组织sid
private String salesOrgSid; // 销售组织sid
@ApiModelProperty("销售组织")
private String salesOrgName; // 销售组织

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmoutbound/ScmOutboundVo.java
View File

@ -65,7 +65,7 @@ public class ScmOutboundVo implements Vo {
private String staffSid; // 业务员sid
@ApiModelProperty("部门sid")
private String orgSid; // 部门sid
private String[][] orgSid; // 部门sid
@ApiModelProperty("销售类型")
private String sellType; // 销售类型
@ -107,7 +107,7 @@ public class ScmOutboundVo implements Vo {
private String deliverGoodsOrgName; // 发货组织
@ApiModelProperty("发货部门sid")
private String deliverGoodsDepSid; // 发货部门sid
private String[][] deliverGoodsDepSid; // 发货部门sid
@ApiModelProperty("发货部门")
private String deliverGoodsDepName; // 发货部门
@ -143,7 +143,7 @@ public class ScmOutboundVo implements Vo {
private String salesOrgName; // 销售组织
@ApiModelProperty("销售部门sid")
private String salesDepSid; // 销售部门sid
private String[][] salesDepSid; // 销售部门sid
@ApiModelProperty("销售部门")
private String salesDepName; // 销售部门

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryQuery.java
View File

@ -65,36 +65,12 @@ public class ScmRealTimeInventoryQuery implements Query {
@ApiModelProperty("库存主单位")
private String inventoryPrimaryUnit; // 库存主单位
@ApiModelProperty("库存量（主单位）")
private String inventory; // 库存量（主单位）
@ApiModelProperty("可用量（主单位）")
private String availableQuantity; // 可用量（主单位）
@ApiModelProperty("库存组织")
private String stockOrgName; // 库存组织
@ApiModelProperty("货主类型")
private String cargoOwnerType; // 货主类型
@ApiModelProperty("货主编码")
private String cargoOwnerNo; // 货主编码
@ApiModelProperty("货主")
private String cargoOwner; // 货主
@ApiModelProperty("库存状态")
private String invenState; // 库存状态
@ApiModelProperty("仓库编码")
private String warehouseNo; // 仓库编码
@ApiModelProperty("保管者类型")
private String custodianType; // 保管者类型
@ApiModelProperty("保管者编码")
private String custodianNo; // 保管者编码
@ApiModelProperty("保管者名称")
private String custodian; // 保管者名称
private String custodian; // 保管者名称
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/kingdee/KingDeeScmOutboundService.java
View File

@ -34,7 +34,7 @@ public class KingDeeScmOutboundService {
private void buildKingDeeReceivable(KingDeeOutbound kingDeeOutbound,ScmOutboundAllDto dto) {
kingDeeOutbound.setFormid("SAL_OUTSTOCK");
// dto转kingDeeOutbound
//销售出库单_明细 数据传输对象
//query_明细 数据传输对象
List<ScmOutboundDetailDto> scmOutboundDetailDtoList = dto.getScmOutboundDetailDtoList();
//销售出库单 数据传输对象
ScmOutboundDto scmOutboundDto = dto.getScmOutboundDto();

30
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmoutbound/ScmOutboundService.java
View File

@ -171,7 +171,7 @@ public class ScmOutboundService extends MybatisBaseService<ScmOutboundMapper, Sc
ScmOutbound scmOutbound = new ScmOutbound();
ScmOutboundDto scmOutboundDto = dto.getScmOutboundDto();
scmOutboundDto.setBillNo(map.get("billNo_Num"));
scmOutboundDto.fillEntity(scmOutbound);
BeanUtil.copyProperties(scmOutboundDto,scmOutbound);
String sid = scmOutbound.getSid();
this.saveOrUpdate(scmOutbound);
List<ScmOutboundDetailDto> scmOutboundDetailDtoList = dto.getScmOutboundDetailDtoList();
@ -193,20 +193,6 @@ public class ScmOutboundService extends MybatisBaseService<ScmOutboundMapper, Sc
List<ScmOutboundDetailVo> scmOutboundDetailVos = scmOutboundDetailService.fetchByBusOutBoundSid(sid);
ScmOutboundAllVo scmOutboundAllVo = new ScmOutboundAllVo();
BeanUtil.copyProperties(scmOutbound, scmOutboundAllVo);
if (StringUtils.isNotBlank(scmOutbound.getDeliverGoodsOrgSid())) { //发货组织sid
List<String> list = Arrays.asList(scmOutbound.getDeliverGoodsOrgSid().split(","));
String[][] s = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
String[] list1 = {};
//根据使用组织查询上级
ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
if (resultBean.getSuccess()) {
list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
}
s[i] = list1;
}
scmOutboundAllVo.setDeliverGoodsOrgSid(s);
}
if (StringUtils.isNotBlank(scmOutbound.getDeliverGoodsDepSid())) { //发货部门sid
List<String> list = Arrays.asList(scmOutbound.getDeliverGoodsDepSid().split(","));
String[][] s = new String[list.size()][];
@ -235,20 +221,6 @@ public class ScmOutboundService extends MybatisBaseService<ScmOutboundMapper, Sc
}
scmOutboundAllVo.setInvenGroupSid(s);
}
if (StringUtils.isNotBlank(scmOutbound.getSalesOrgSid())) { //销售组织sid
List<String> list = Arrays.asList(scmOutbound.getSalesOrgSid().split(","));
String[][] s = new String[list.size()][];
for (int i = 0; i < list.size(); i++) {
String[] list1 = {};
//根据使用组织查询上级
ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
if (resultBean.getSuccess()) {
list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
}
s[i] = list1;
}
scmOutboundAllVo.setSalesOrgSid(s);
}
if (StringUtils.isNotBlank(scmOutbound.getSalesDepSid())) { //销售部门sid
List<String> list = Arrays.asList(scmOutbound.getSalesDepSid().split(","));
String[][] s = new String[list.size()][];

40
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java
View File

@ -86,11 +86,11 @@ public class ScmRealTimeInventoryService extends MybatisBaseService<ScmRealTimeI
if (StringUtils.isNotBlank(query.getMNum())) {
qw.eq("mNum", query.getMNum());
qw.like("mNum", query.getMNum());
}
if (StringUtils.isNotBlank(query.getMName())) {
qw.eq("mName", query.getMName());
qw.like("mName", query.getMName());
}
if (StringUtils.isNotBlank(query.getWarehouse())) {
@ -101,48 +101,16 @@ public class ScmRealTimeInventoryService extends MybatisBaseService<ScmRealTimeI
qw.eq("inventoryPrimaryUnit", query.getInventoryPrimaryUnit());
}
if (StringUtils.isNotBlank(query.getInventory())) {
qw.eq("inventory", query.getInventory());
}
if (StringUtils.isNotBlank(query.getAvailableQuantity())) {
qw.eq("availableQuantity", query.getAvailableQuantity());
}
if (StringUtils.isNotBlank(query.getStockOrgName())) {
qw.eq("stockOrgName", query.getStockOrgName());
}
if (StringUtils.isNotBlank(query.getCargoOwnerType())) {
qw.eq("cargoOwnerType", query.getCargoOwnerType());
}
if (StringUtils.isNotBlank(query.getCargoOwnerNo())) {
qw.eq("cargoOwnerNo", query.getCargoOwnerNo());
}
if (StringUtils.isNotBlank(query.getCargoOwner())) {
qw.eq("cargoOwner", query.getCargoOwner());
qw.like("cargoOwner", query.getCargoOwner());
}
if (StringUtils.isNotBlank(query.getInvenState())) {
qw.eq("invenState", query.getInvenState());
}
if (StringUtils.isNotBlank(query.getWarehouseNo())) {
qw.eq("warehouseNo", query.getWarehouseNo());
}
if (StringUtils.isNotBlank(query.getCustodianType())) {
qw.eq("custodianType", query.getCustodianType());
}
if (StringUtils.isNotBlank(query.getCustodianNo())) {
qw.eq("custodianNo", query.getCustodianNo());
}
if (StringUtils.isNotBlank(query.getCustodian())) {
qw.eq("custodian", query.getCustodian());
qw.like("custodian", query.getCustodian());
}
return qw;
}

Write Preview
Loading…
Cancel
Save