|
|
@ -1,7 +1,9 @@ |
|
|
package com.gaotao.modules.factory.controller; |
|
|
package com.gaotao.modules.factory.controller; |
|
|
|
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.core.JsonProcessingException; |
|
|
import com.gaotao.common.utils.PageUtils; |
|
|
import com.gaotao.common.utils.PageUtils; |
|
|
import com.gaotao.common.utils.R; |
|
|
import com.gaotao.common.utils.R; |
|
|
|
|
|
import com.gaotao.modules.api.service.IfsApiService; |
|
|
import com.gaotao.modules.factory.entity.PartAttribute; |
|
|
import com.gaotao.modules.factory.entity.PartAttribute; |
|
|
import com.gaotao.modules.factory.entity.dto.NoOrderPartAttributeDto; |
|
|
import com.gaotao.modules.factory.entity.dto.NoOrderPartAttributeDto; |
|
|
import com.gaotao.modules.factory.entity.dto.PartAttributeQueryDto; |
|
|
import com.gaotao.modules.factory.entity.dto.PartAttributeQueryDto; |
|
|
@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 料件属性控制器 |
|
|
* 料件属性控制器 |
|
|
@ -22,6 +25,9 @@ public class PartAttributeController extends AbstractController { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private PartAttributeService partAttributeService; |
|
|
private PartAttributeService partAttributeService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private IfsApiService ifsApiService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 分页查询料件属性列表 |
|
|
* 分页查询料件属性列表 |
|
|
*/ |
|
|
*/ |
|
|
@ -42,7 +48,9 @@ public class PartAttributeController extends AbstractController { |
|
|
@GetMapping("/info") |
|
|
@GetMapping("/info") |
|
|
public R info(@RequestParam String site, @RequestParam String partNo) { |
|
|
public R info(@RequestParam String site, @RequestParam String partNo) { |
|
|
PartAttribute partAttribute = partAttributeService.getPartAttributeByKey(site, partNo); |
|
|
PartAttribute partAttribute = partAttributeService.getPartAttributeByKey(site, partNo); |
|
|
return R.ok().put("data", partAttribute); |
|
|
|
|
|
|
|
|
List<Map<String, Object>> inventoryPartDefLoc; |
|
|
|
|
|
inventoryPartDefLoc = ifsApiService.InventoryPartDefLoc(site, partNo); |
|
|
|
|
|
return R.ok().put("data", partAttribute).put("partDefLoc", inventoryPartDefLoc); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|