|
|
|
@ -344,6 +344,7 @@ public class SalebackController {
|
|
|
|
|
List<Saleback_item0Entity> jg_salesback_item0List = salebackService.GetSaleback_item0List(id);
|
|
|
|
|
List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(jg_salesback_item0List,Saleback_item0Model.class);
|
|
|
|
|
for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){
|
|
|
|
|
|
|
|
|
|
Map<String,Object> licenseNumMap = new HashMap<>();
|
|
|
|
|
jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap));
|
|
|
|
|
Map<String,Object> materialIdMap = new HashMap<>();
|
|
|
|
@ -364,6 +365,44 @@ public class SalebackController {
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 表单信息(详情页)
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping("/detail2/{id}")
|
|
|
|
|
public ActionResult<SalebackInfoVO> detailInfo2(@PathVariable("id") String id){
|
|
|
|
|
SalebackEntity entity= salebackService.getInfo(id);
|
|
|
|
|
SalebackInfoVO vo=JsonUtil.getJsonToBean(entity, SalebackInfoVO.class);
|
|
|
|
|
List<Saleback_item0Entity> saleback_item0Models = salebackService.querySaleBackItemInfo(id);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//子表数据转换
|
|
|
|
|
// List<Saleback_item0Entity> jg_salesback_item0List = salebackService.GetSaleback_item0List(id);
|
|
|
|
|
List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(saleback_item0Models,Saleback_item0Model.class);
|
|
|
|
|
// for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){
|
|
|
|
|
//
|
|
|
|
|
// Map<String,Object> licenseNumMap = new HashMap<>();
|
|
|
|
|
// jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap));
|
|
|
|
|
// Map<String,Object> materialIdMap = new HashMap<>();
|
|
|
|
|
// jg_salesback_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesback_item0Model.getMaterialId(),materialIdMap));
|
|
|
|
|
// Map<String,Object> businessIdMap = new HashMap<>();
|
|
|
|
|
// jg_salesback_item0Model.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",jg_salesback_item0Model.getBusinessId(),businessIdMap));
|
|
|
|
|
// }
|
|
|
|
|
vo.setSaleback_item0List(jg_salesback_item0ModelList);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class));
|
|
|
|
|
|
|
|
|
|
//添加到详情表单对象中
|
|
|
|
|
Map<String,Object> salesOrderIdMap = new HashMap<>();
|
|
|
|
|
vo.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",vo.getSalesOrderId(),salesOrderIdMap));
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|