no message
parent
bf7fe4e374
commit
78e7ebd901
|
|
@ -57,17 +57,13 @@ public class AreaController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询area")
|
|
||||||
@ApiOperation("查询area")
|
@ApiOperation("查询area")
|
||||||
@PreAuthorize("@el.check('area:list')")
|
|
||||||
public ResponseEntity<Object> queryArea(AreaQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryArea(AreaQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(areaService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(areaService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/queryAreaList")
|
@GetMapping("/queryAreaList")
|
||||||
@Log("查询所有的库区数据")
|
|
||||||
@ApiOperation("查询所有的库区数据")
|
@ApiOperation("查询所有的库区数据")
|
||||||
@PreAuthorize("@el.check('area:list')")
|
|
||||||
public ResponseEntity<List<AreaDto>> queryAreaList(AreaQueryCriteria criteria){
|
public ResponseEntity<List<AreaDto>> queryAreaList(AreaQueryCriteria criteria){
|
||||||
return new ResponseEntity<>(areaService.queryAll(criteria), HttpStatus.OK);
|
return new ResponseEntity<>(areaService.queryAll(criteria), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class BigBomController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询bigBom")
|
|
||||||
@ApiOperation("查询bigBom")
|
@ApiOperation("查询bigBom")
|
||||||
@PreAuthorize("@el.check('bigBom:list')")
|
|
||||||
public ResponseEntity<Object> queryBigBom(BigBomQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryBigBom(BigBomQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(bigBomService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(bigBomService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,17 +52,13 @@ public class BigItemController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询bigitem")
|
|
||||||
@ApiOperation("查询bigitem")
|
@ApiOperation("查询bigitem")
|
||||||
@PreAuthorize("@el.check('bigItem:list')")
|
|
||||||
public ResponseEntity<Object> queryBigItem(BigItemQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryBigItem(BigItemQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(bigItemService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(bigItemService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/All")
|
@GetMapping("/All")
|
||||||
@Log("查询所有bigitem")
|
|
||||||
@ApiOperation("查询所有bigitem")
|
@ApiOperation("查询所有bigitem")
|
||||||
@PreAuthorize("@el.check('bigItem:list')")
|
|
||||||
public ResponseEntity<Object> queryAllBigItem(BigItemQueryCriteria criteria){
|
public ResponseEntity<Object> queryAllBigItem(BigItemQueryCriteria criteria){
|
||||||
return new ResponseEntity<>(bigItemService.queryAll(criteria),HttpStatus.OK);
|
return new ResponseEntity<>(bigItemService.queryAll(criteria),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class BillTypeController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询bill_type")
|
|
||||||
@ApiOperation("查询bill_type")
|
@ApiOperation("查询bill_type")
|
||||||
@PreAuthorize("@el.check('billType:list')")
|
|
||||||
public ResponseEntity<Object> queryBillType(BillTypeQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryBillType(BillTypeQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(billTypeService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(billTypeService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,7 @@ public class BoxController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询box")
|
|
||||||
@ApiOperation("查询box")
|
@ApiOperation("查询box")
|
||||||
@PreAuthorize("@el.check('box:list')")
|
|
||||||
public ResponseEntity<Object> queryBox(BoxQueryCriteria criteria, Pageable pageable) {
|
public ResponseEntity<Object> queryBox(BoxQueryCriteria criteria, Pageable pageable) {
|
||||||
return new ResponseEntity<>(boxService.queryAll(criteria, pageable), OK);
|
return new ResponseEntity<>(boxService.queryAll(criteria, pageable), OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class CarRegController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询car_reg")
|
|
||||||
@ApiOperation("查询car_reg")
|
@ApiOperation("查询car_reg")
|
||||||
@PreAuthorize("@el.check('carReg:list')")
|
|
||||||
public ResponseEntity<Object> queryCarReg(CarRegQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryCarReg(CarRegQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(carRegService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(carRegService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -83,17 +83,13 @@ public class ItemController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询item")
|
|
||||||
@ApiOperation("查询item")
|
@ApiOperation("查询item")
|
||||||
@PreAuthorize("@el.check('item:list')")
|
|
||||||
public ResponseEntity<Object> queryItem(ItemQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryItem(ItemQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(itemService.queryAll(criteria,pageable), HttpStatus.OK);
|
return new ResponseEntity<>(itemService.queryAll(criteria,pageable), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/itemList")
|
@GetMapping("/itemList")
|
||||||
@Log("查询所有的物料数据")
|
|
||||||
@ApiOperation("查询所有的物料数据")
|
@ApiOperation("查询所有的物料数据")
|
||||||
@PreAuthorize("@el.check('item:list')")
|
|
||||||
public ResponseEntity<List<ItemDto>> queryItemList(ItemQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<List<ItemDto>> queryItemList(ItemQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(itemService.queryAll(criteria), HttpStatus.OK);
|
return new ResponseEntity<>(itemService.queryAll(criteria), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
@ -109,6 +105,7 @@ public class ItemController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping(value = "/import_data")
|
@PostMapping(value = "/import_data")
|
||||||
|
@Log("导入物料")
|
||||||
@ApiOperation("导入物料")
|
@ApiOperation("导入物料")
|
||||||
@Transactional
|
@Transactional
|
||||||
@AnonymousAccess
|
@AnonymousAccess
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class LampLogController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询lamp_log")
|
|
||||||
@ApiOperation("查询lamp_log")
|
@ApiOperation("查询lamp_log")
|
||||||
@PreAuthorize("@el.check('lampLog:list')")
|
|
||||||
public ResponseEntity<Object> queryLampLog(LampLogQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryLampLog(LampLogQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(lampLogService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(lampLogService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -169,25 +169,19 @@ public class PointController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询point")
|
|
||||||
@ApiOperation("查询point")
|
@ApiOperation("查询point")
|
||||||
@PreAuthorize("@el.check('point:list')")
|
|
||||||
public ResponseEntity<Object> queryPoint(PointQueryCriteria criteria, Pageable pageable) {
|
public ResponseEntity<Object> queryPoint(PointQueryCriteria criteria, Pageable pageable) {
|
||||||
return new ResponseEntity<>(pointService.queryAll(criteria, pageable), HttpStatus.OK);
|
return new ResponseEntity<>(pointService.queryAll(criteria, pageable), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = "/queryPointList")
|
@GetMapping(value = "/queryPointList")
|
||||||
@Log("下拉查询点位")
|
|
||||||
@ApiOperation("下拉查询点位")
|
@ApiOperation("下拉查询点位")
|
||||||
@PreAuthorize("@el.check('point:queryPointList')")
|
|
||||||
public ResponseEntity<Object> queryPointList(PointQueryCriteria criteria) {
|
public ResponseEntity<Object> queryPointList(PointQueryCriteria criteria) {
|
||||||
return new ResponseEntity<>(pointService.queryAll(criteria), HttpStatus.OK);
|
return new ResponseEntity<>(pointService.queryAll(criteria), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = "/queryKyPointList")
|
@GetMapping(value = "/queryKyPointList")
|
||||||
@Log("查询可用空闲的点位point")
|
|
||||||
@ApiOperation("查询可用空闲的点位point")
|
@ApiOperation("查询可用空闲的点位point")
|
||||||
@PreAuthorize("@el.check('point:list')")
|
|
||||||
public ResponseEntity<Object> queryKyPointList(PointQueryCriteria criteria, Pageable pageable) {
|
public ResponseEntity<Object> queryKyPointList(PointQueryCriteria criteria, Pageable pageable) {
|
||||||
return new ResponseEntity<>(pointService.queryKyPointList(), HttpStatus.OK);
|
return new ResponseEntity<>(pointService.queryKyPointList(), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -133,17 +133,13 @@ public class StockController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询stock")
|
|
||||||
@ApiOperation("查询stock")
|
@ApiOperation("查询stock")
|
||||||
@PreAuthorize("@el.check('stock:list')")
|
|
||||||
public ResponseEntity<Object> queryStock(StockQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryStock(StockQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(stockService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(stockService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Log("查询可用空闲的容器stock")
|
|
||||||
@ApiOperation("查询可用空闲的容器stock")
|
@ApiOperation("查询可用空闲的容器stock")
|
||||||
@GetMapping(value = "/queryKyStockList")
|
@GetMapping(value = "/queryKyStockList")
|
||||||
@PreAuthorize("@el.check('stock:list')")
|
|
||||||
public ResponseEntity<Object> queryKyStockList(StockQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryKyStockList(StockQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(stockService.queryKyStockList(criteria.getCode()),HttpStatus.OK);
|
return new ResponseEntity<>(stockService.queryKyStockList(criteria.getCode()),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,7 @@ public class StockTypeController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询stock_type")
|
|
||||||
@ApiOperation("查询stock_type")
|
@ApiOperation("查询stock_type")
|
||||||
@PreAuthorize("@el.check('stockType:list')")
|
|
||||||
public ResponseEntity<Object> queryStockType(StockTypeQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryStockType(StockTypeQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(stockTypeService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(stockTypeService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,18 +55,14 @@ public class TableConfigController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询tableconfig")
|
|
||||||
@ApiOperation("查询tableconfig")
|
@ApiOperation("查询tableconfig")
|
||||||
@PreAuthorize("@el.check('tableConfig:list')")
|
|
||||||
public ResponseEntity<Object> queryTableConfig(TableConfigQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryTableConfig(TableConfigQueryCriteria criteria, Pageable pageable){
|
||||||
criteria.setCreateBy(SecurityUtils.getCurrentUsername());
|
criteria.setCreateBy(SecurityUtils.getCurrentUsername());
|
||||||
return new ResponseEntity<>(tableConfigService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(tableConfigService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/All")
|
@GetMapping("/All")
|
||||||
@Log("查询tableconfig")
|
|
||||||
@ApiOperation("查询tableconfig")
|
@ApiOperation("查询tableconfig")
|
||||||
@PreAuthorize("@el.check('tableConfig:list')")
|
|
||||||
public ResponseEntity<Object> queryTableConfigOne(TableConfigQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryTableConfigOne(TableConfigQueryCriteria criteria, Pageable pageable){
|
||||||
criteria.setCreateBy(SecurityUtils.getCurrentUsername());
|
criteria.setCreateBy(SecurityUtils.getCurrentUsername());
|
||||||
List<TableConfigDto> tableConfigDtos= tableConfigService.queryAll(criteria);
|
List<TableConfigDto> tableConfigDtos= tableConfigService.queryAll(criteria);
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class ZcjxbController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询zcjxb")
|
|
||||||
@ApiOperation("查询zcjxb")
|
@ApiOperation("查询zcjxb")
|
||||||
@PreAuthorize("@el.check('zcjxb:list')")
|
|
||||||
public ResponseEntity<Object> queryZcjxb(ZcjxbQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryZcjxb(ZcjxbQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(zcjxbService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(zcjxbService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,7 @@ public class AgvTaskController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询agvTask")
|
|
||||||
@ApiOperation("查询agvTask")
|
@ApiOperation("查询agvTask")
|
||||||
@PreAuthorize("@el.check('agvTask:list')")
|
|
||||||
public ResponseEntity<Object> queryAgvTask(AgvTaskQueryCriteria criteria, Pageable pageable) {
|
public ResponseEntity<Object> queryAgvTask(AgvTaskQueryCriteria criteria, Pageable pageable) {
|
||||||
return new ResponseEntity<>(agvTaskService.queryAll(criteria, pageable), HttpStatus.OK);
|
return new ResponseEntity<>(agvTaskService.queryAll(criteria, pageable), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -110,9 +110,7 @@ public class AsnDetailController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询asn_detail")
|
|
||||||
@ApiOperation("查询asn_detail")
|
@ApiOperation("查询asn_detail")
|
||||||
@PreAuthorize("@el.check('asnDetail:list')")
|
|
||||||
public ResponseEntity<Object> queryAsnDetail(AsnDetailQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryAsnDetail(AsnDetailQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(asnDetailService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(asnDetailService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -70,9 +70,7 @@ public class BaseCodeController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询baseCode")
|
|
||||||
@ApiOperation("查询baseCode")
|
@ApiOperation("查询baseCode")
|
||||||
@PreAuthorize("@el.check('baseCode:list')")
|
|
||||||
public ResponseEntity<Object> queryBaseCode(BaseCodeQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryBaseCode(BaseCodeQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(baseCodeService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(baseCodeService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,17 +72,13 @@ public class CountDetailController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询count_detail")
|
|
||||||
@ApiOperation("查询count_detail")
|
@ApiOperation("查询count_detail")
|
||||||
@PreAuthorize("@el.check('countDetail:list')")
|
|
||||||
public ResponseEntity<Object> queryCountDetail(CountDetailQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryCountDetail(CountDetailQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(countDetailService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(countDetailService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = "/queryPlanCountDetail")
|
@GetMapping(value = "/queryPlanCountDetail")
|
||||||
@Log("查询count_detail")
|
|
||||||
@ApiOperation("查询count_detail")
|
@ApiOperation("查询count_detail")
|
||||||
@PreAuthorize("@el.check('countDetail:list')")
|
|
||||||
public ResponseEntity<Object> queryPlanCountDetail(CountDetailQueryCriteria criteria){
|
public ResponseEntity<Object> queryPlanCountDetail(CountDetailQueryCriteria criteria){
|
||||||
// log.info(criteria.getPlanId()+"------盘点ID");
|
// log.info(criteria.getPlanId()+"------盘点ID");
|
||||||
return new ResponseEntity<>(countDetailService.queryAll(criteria),HttpStatus.OK);
|
return new ResponseEntity<>(countDetailService.queryAll(criteria),HttpStatus.OK);
|
||||||
|
|
|
||||||
|
|
@ -58,9 +58,7 @@ public class CountPlanController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询count_plan")
|
|
||||||
@ApiOperation("查询count_plan")
|
@ApiOperation("查询count_plan")
|
||||||
@PreAuthorize("@el.check('countPlan:list')")
|
|
||||||
public ResponseEntity<Object> queryCountPlan(CountPlanQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryCountPlan(CountPlanQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(countPlanService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(countPlanService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -65,17 +65,13 @@ public class CountRecordController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询count_record")
|
|
||||||
@ApiOperation("查询count_record")
|
@ApiOperation("查询count_record")
|
||||||
@PreAuthorize("@el.check('countRecord:list')")
|
|
||||||
public ResponseEntity<Object> queryCountRecord(CountRecordQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryCountRecord(CountRecordQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(countRecordService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(countRecordService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = "/queryPlanCountRecord")
|
@GetMapping(value = "/queryPlanCountRecord")
|
||||||
@Log("查询count_detail")
|
|
||||||
@ApiOperation("查询count_detail")
|
@ApiOperation("查询count_detail")
|
||||||
@PreAuthorize("@el.check('countDetail:list')")
|
|
||||||
public ResponseEntity<Object> queryPlanCountRecord(CountRecordQueryCriteria criteria){
|
public ResponseEntity<Object> queryPlanCountRecord(CountRecordQueryCriteria criteria){
|
||||||
return new ResponseEntity<>(countRecordService.queryAll(criteria),HttpStatus.OK);
|
return new ResponseEntity<>(countRecordService.queryAll(criteria),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -57,9 +57,7 @@ public class InventoryController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询inventory")
|
|
||||||
@ApiOperation("查询inventory")
|
@ApiOperation("查询inventory")
|
||||||
@PreAuthorize("@el.check('inventory:list')")
|
|
||||||
public ResponseEntity<Object> queryInventory(InventoryQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryInventory(InventoryQueryCriteria criteria, Pageable pageable){
|
||||||
if (criteria.getItemCodeOne()!=null&&criteria.getItemCode()!=null){
|
if (criteria.getItemCodeOne()!=null&&criteria.getItemCode()!=null){
|
||||||
criteria.setItemCodeOne(null);
|
criteria.setItemCodeOne(null);
|
||||||
|
|
@ -94,9 +92,7 @@ public class InventoryController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = "/queryInv")
|
@GetMapping(value = "/queryInv")
|
||||||
@Log("查询inventory")
|
|
||||||
@ApiOperation("查询inventory")
|
@ApiOperation("查询inventory")
|
||||||
@PreAuthorize("@el.check('inventory:queryInv')")
|
|
||||||
public ResponseEntity<Object> queryInv(InvQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryInv(InvQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(inventoryService.queryAll(criteria),HttpStatus.OK);
|
return new ResponseEntity<>(inventoryService.queryAll(criteria),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class InventoryLogController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询inventoryLog")
|
|
||||||
@ApiOperation("查询inventoryLog")
|
@ApiOperation("查询inventoryLog")
|
||||||
@PreAuthorize("@el.check('inventoryLog:list')")
|
|
||||||
public ResponseEntity<Object> queryInventoryLog(InventoryLogQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryInventoryLog(InventoryLogQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(inventoryLogService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(inventoryLogService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -66,9 +66,7 @@ public class ItemKeyController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询item_key")
|
|
||||||
@ApiOperation("查询item_key")
|
@ApiOperation("查询item_key")
|
||||||
@PreAuthorize("@el.check('itemKey:list')")
|
|
||||||
public ResponseEntity<Object> queryItemKey(ItemKeyQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryItemKey(ItemKeyQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(itemKeyService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(itemKeyService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,9 +59,7 @@ public class MoController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询mo")
|
|
||||||
@ApiOperation("查询mo")
|
@ApiOperation("查询mo")
|
||||||
@PreAuthorize("@el.check('mo:list')")
|
|
||||||
public ResponseEntity<Object> queryMo(MoQueryCriteria criteria, Pageable pageable) {
|
public ResponseEntity<Object> queryMo(MoQueryCriteria criteria, Pageable pageable) {
|
||||||
return new ResponseEntity<>(moService.queryAll(criteria, pageable), HttpStatus.OK);
|
return new ResponseEntity<>(moService.queryAll(criteria, pageable), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class OrderController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询order")
|
|
||||||
@ApiOperation("查询order")
|
@ApiOperation("查询order")
|
||||||
@PreAuthorize("@el.check('order:list')")
|
|
||||||
public ResponseEntity<Object> queryOrder(OrderQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryOrder(OrderQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(orderService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(orderService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -86,9 +86,7 @@ public class PickDetailController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询pickDetail")
|
|
||||||
@ApiOperation("查询pickDetail")
|
@ApiOperation("查询pickDetail")
|
||||||
@PreAuthorize("@el.check('pickDetail:list')")
|
|
||||||
public ResponseEntity<Object> queryPickDetail(PickDetailQueryCriteria criteria, Pageable pageable) {
|
public ResponseEntity<Object> queryPickDetail(PickDetailQueryCriteria criteria, Pageable pageable) {
|
||||||
return new ResponseEntity<>(pickDetailService.queryAll(criteria, pageable), HttpStatus.OK);
|
return new ResponseEntity<>(pickDetailService.queryAll(criteria, pageable), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,18 +60,14 @@ public class TaskController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询task")
|
|
||||||
@ApiOperation("查询task")
|
@ApiOperation("查询task")
|
||||||
@PreAuthorize("@el.check('task:list')")
|
|
||||||
public ResponseEntity<Object> queryTask(TaskQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryTask(TaskQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(taskService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(taskService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@GetMapping(value = "/queryAsnTask")
|
@GetMapping(value = "/queryAsnTask")
|
||||||
@Log("查询task")
|
|
||||||
@ApiOperation("查询task")
|
@ApiOperation("查询task")
|
||||||
@PreAuthorize("@el.check('task:list')")
|
|
||||||
public ResponseEntity<Object> queryAsnTask(TaskQueryCriteria criteria){
|
public ResponseEntity<Object> queryAsnTask(TaskQueryCriteria criteria){
|
||||||
// TaskQueryCriteria tq=new TaskQueryCriteria();
|
// TaskQueryCriteria tq=new TaskQueryCriteria();
|
||||||
// tq.setAsnDetailId(id);
|
// tq.setAsnDetailId(id);
|
||||||
|
|
|
||||||
|
|
@ -52,9 +52,7 @@ public class TaskLogController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
@Log("查询taskLog")
|
|
||||||
@ApiOperation("查询taskLog")
|
@ApiOperation("查询taskLog")
|
||||||
@PreAuthorize("@el.check('taskLog:list')")
|
|
||||||
public ResponseEntity<Object> queryTaskLog(TaskLogQueryCriteria criteria, Pageable pageable){
|
public ResponseEntity<Object> queryTaskLog(TaskLogQueryCriteria criteria, Pageable pageable){
|
||||||
return new ResponseEntity<>(taskLogService.queryAll(criteria,pageable),HttpStatus.OK);
|
return new ResponseEntity<>(taskLogService.queryAll(criteria,pageable),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue