Browse Source

根据销售出库单推送销售退货单时,缺少货主及货主类型字段内容,货主为分公司编码,货主类型为业务组织。

master
God 1 year ago
parent
commit
1558bec75e
  1. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  2. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java
  3. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java
  4. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@ -687,6 +687,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
if (StringUtils.isNotBlank(vehicleSelectVo.getOrgCode())) { if (StringUtils.isNotBlank(vehicleSelectVo.getOrgCode())) {
salesReturn.setFSaleOrgId(vehicleSelectVo.getOrgCode()); salesReturn.setFSaleOrgId(vehicleSelectVo.getOrgCode());
salesReturn.setFStockOrgId(vehicleSelectVo.getOrgCode()); salesReturn.setFStockOrgId(vehicleSelectVo.getOrgCode());
salesReturnDetailDto.setFOwnerId(vehicleSelectVo.getOrgCode());
busSalesReturnOrdersDto.setSaleOrgId(vehicleSelectVo.getOrgCode()); busSalesReturnOrdersDto.setSaleOrgId(vehicleSelectVo.getOrgCode());
} }
BaseSalesReturnVo returnVo = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData(); BaseSalesReturnVo returnVo = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData();
@ -715,6 +716,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
busSalesReturnOrdersDto.setBillNo(billNo); busSalesReturnOrdersDto.setBillNo(billNo);
} }
busSalesReturnOrdersService.saveReturnOrders(busSalesReturnOrdersDto); busSalesReturnOrdersService.saveReturnOrders(busSalesReturnOrdersDto);
salesReturnDetailDto.setFOwnerTypeId("业务组织");
salesReturnDetails.add(salesReturnDetailDto); salesReturnDetails.add(salesReturnDetailDto);
} }
} }

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java

@ -50,5 +50,9 @@ public class SalesReturn {
public String FDeliveryDate; public String FDeliveryDate;
@ApiModelProperty("是否赠品") @ApiModelProperty("是否赠品")
public String FIsFree; public String FIsFree;
@ApiModelProperty("货主")
public String FOwnerId;
@ApiModelProperty("货主类型")
public String FOwnerTypeId;
} }
} }

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java

@ -90,6 +90,8 @@ public class SalesReturnOrdersService extends FinKingDeeService {
m.put("FRealQty", c.getFRealQty()); m.put("FRealQty", c.getFRealQty());
m.put("FDeliveryDate", c.getFDeliveryDate()); m.put("FDeliveryDate", c.getFDeliveryDate());
m.put("FIsFree", c.getFIsFree()); m.put("FIsFree", c.getFIsFree());
m.put("FOwnerId",c.getFOwnerId());
m.put("FOwnerTypeId",c.getFOwnerTypeId());
collectionDetailMap.add(m); collectionDetailMap.add(m);
} }
return rb.success().setData(collectionDetailMap); return rb.success().setData(collectionDetailMap);

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json

@ -45,9 +45,9 @@
"FReturnType": { "FReturnType": {
"FNumber": "THLX01_SYS" "FNumber": "THLX01_SYS"
}, },
"FOwnerTypeId": "", "FOwnerTypeId": "@KD_FOwnerTypeId",
"FOwnerId": { "FOwnerId": {
"FNumber": "" "FNumber": "@KD_FOwnerId"
}, },
"FProduceDate": "", "FProduceDate": "",
"FExpiryDate": "", "FExpiryDate": "",

Loading…
Cancel
Save