Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jyzb_platformV2
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Members
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
赵剑炜
jyzb_platformV2
Commits
547c5f2d
Commit
547c5f2d
authored
Dec 28, 2023
by
赵剑炜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
为日志添加忽略消息
parent
84fc6b3b
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
74 行增加
和
66 行删除
+74
-66
ApplicationController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ApplicationController.java
+1
-1
BussinessController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java
+3
-2
BussinessInventoryController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java
+3
-3
CabinetController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java
+5
-17
DestoryUnitController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DestoryUnitController.java
+2
-2
DeviceConfigController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java
+3
-3
EquipmentSizeController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java
+4
-4
EquipmentTypeController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
+8
-5
InventoryController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
+38
-23
PubOrgController.java
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
+7
-6
没有找到文件。
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ApplicationController.java
View file @
547c5f2d
...
@@ -30,7 +30,7 @@ public class ApplicationController {
...
@@ -30,7 +30,7 @@ public class ApplicationController {
@Resource
@Resource
private
ApplicationService
applicationService
;
private
ApplicationService
applicationService
;
//获取应用信息的分页
//获取应用信息的分页
@PostMapping
(
path
=
"/GetAllUpdateCfg"
,
name
=
"获取应用信息的分页"
)
@PostMapping
(
path
=
"/GetAllUpdateCfg"
,
name
=
"获取应用信息的分页
#enable
"
)
@ApiOperation
(
"获取应用信息的分页"
)
@ApiOperation
(
"获取应用信息的分页"
)
public
ApiRes
<
PageResult
<
Application
>>
GetAllUpdateCfg
(
@RequestBody
ApplicationReq
req
){
public
ApiRes
<
PageResult
<
Application
>>
GetAllUpdateCfg
(
@RequestBody
ApplicationReq
req
){
return
ApiRes
.
success
(
applicationService
.
GetAllUpdateCfg
(
req
));
return
ApiRes
.
success
(
applicationService
.
GetAllUpdateCfg
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java
View file @
547c5f2d
...
@@ -42,13 +42,14 @@ public class BussinessController {
...
@@ -42,13 +42,14 @@ public class BussinessController {
//查看业务单(可以条件查询)
//查看业务单(可以条件查询)
@PostMapping
(
path
=
"/showBussinessOrder"
,
name
=
"查看业务单"
)
@PostMapping
(
path
=
"/showBussinessOrder"
,
name
=
"查看业务单#enable"
)
@ApiOperation
(
"查看业务单"
)
@ApiOperation
(
"查看业务单"
)
public
ApiRes
<
PageResult
<
BusForm
>>
showBussinessOrder
(
@RequestBody
QueryBusFormReq
req
){
public
ApiRes
<
PageResult
<
BusForm
>>
showBussinessOrder
(
@RequestBody
QueryBusFormReq
req
){
return
ApiRes
.
success
(
busFormService
.
showBussinessOrder
(
req
));
return
ApiRes
.
success
(
busFormService
.
showBussinessOrder
(
req
));
}
}
//根据业务单id查询出入库单据
//根据业务单id查询出入库单据
@PostMapping
(
path
=
"/showOrderByBusOrderId"
,
name
=
"根据业务单id查询出入库单据"
)
@PostMapping
(
path
=
"/showOrderByBusOrderId"
,
name
=
"根据业务单id查询出入库单据
#enable
"
)
@ApiOperation
(
"根据业务单id查询出入库单据"
)
@ApiOperation
(
"根据业务单id查询出入库单据"
)
public
ApiRes
<
Object
>
showOrderByBusOrderId
(
@RequestBody
QueryBusFormReq
req
){
public
ApiRes
<
Object
>
showOrderByBusOrderId
(
@RequestBody
QueryBusFormReq
req
){
return
ApiRes
.
success
(
busFormService
.
showOrderByBusOrderId
(
req
));
return
ApiRes
.
success
(
busFormService
.
showOrderByBusOrderId
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java
View file @
547c5f2d
...
@@ -49,7 +49,7 @@ public class BussinessInventoryController {
...
@@ -49,7 +49,7 @@ public class BussinessInventoryController {
//盘库申请
//盘库申请
@PostMapping
(
path
=
"/Check"
,
name
=
"预览盘点单"
)
@PostMapping
(
path
=
"/Check"
,
name
=
"预览盘点单
#enable
"
)
@ApiOperation
(
"预览盘点单"
)
@ApiOperation
(
"预览盘点单"
)
public
ApiRes
<
BussinessInventoryDto
>
Check
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
BussinessInventoryReq
req
){
public
ApiRes
<
BussinessInventoryDto
>
Check
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
BussinessInventoryReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
...
@@ -64,14 +64,14 @@ public class BussinessInventoryController {
...
@@ -64,14 +64,14 @@ public class BussinessInventoryController {
return
ApiRes
.
success
(
BussinessInventoryService
.
Start
(
req
));
return
ApiRes
.
success
(
BussinessInventoryService
.
Start
(
req
));
}
}
//查询列表
//查询列表
@PostMapping
(
path
=
"/GetPage"
,
name
=
"查询列表"
)
@PostMapping
(
path
=
"/GetPage"
,
name
=
"查询列表
#enable
"
)
@ApiOperation
(
"查询列表"
)
@ApiOperation
(
"查询列表"
)
public
ApiRes
<
PageResult
<
BussinessInventory
>>
GetPage
(
@RequestBody
BussinessInventoryReq
req
){
public
ApiRes
<
PageResult
<
BussinessInventory
>>
GetPage
(
@RequestBody
BussinessInventoryReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
return
ApiRes
.
success
(
BussinessInventoryService
.
GetPage
(
req
));
return
ApiRes
.
success
(
BussinessInventoryService
.
GetPage
(
req
));
}
}
//盘库申请
//盘库申请
@PostMapping
(
path
=
"/GetById"
,
name
=
"查询详情"
)
@PostMapping
(
path
=
"/GetById"
,
name
=
"查询详情
#enable
"
)
@ApiOperation
(
"查询详情"
)
@ApiOperation
(
"查询详情"
)
public
ApiRes
<
BussinessInventoryDto
>
GetById
(
@RequestBody
BussinessInventoryReq
req
){
public
ApiRes
<
BussinessInventoryDto
>
GetById
(
@RequestBody
BussinessInventoryReq
req
){
//判断是否有工作流id,如果有则将状态进行修改
//判断是否有工作流id,如果有则将状态进行修改
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java
View file @
547c5f2d
...
@@ -81,23 +81,21 @@ public class CabinetController {
...
@@ -81,23 +81,21 @@ public class CabinetController {
}
}
//通过单警柜id查询单个箱门及其箱门信息
//通过单警柜id查询单个箱门及其箱门信息
@PostMapping
(
path
=
"/ShowOneCabinet"
,
name
=
"查询单个单警柜及其箱门信息"
)
@PostMapping
(
path
=
"/ShowOneCabinet"
,
name
=
"查询单个单警柜及其箱门信息
#enable
"
)
@ApiOperation
(
"查询单个单警柜及其箱门信息"
)
@ApiOperation
(
"查询单个单警柜及其箱门信息"
)
public
ApiRes
<
CabinetDto
>
showOneCabinet
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetReq
req
){
public
ApiRes
<
CabinetDto
>
showOneCabinet
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetReq
req
){
return
ApiRes
.
success
(
cabinetService
.
showOneCabinet
(
req
));
return
ApiRes
.
success
(
cabinetService
.
showOneCabinet
(
req
));
}
}
@PostMapping
(
path
=
"/ShowCabinetList"
,
name
=
"查询单警柜列表#enable"
)
//根据组织机构id查询出单警柜的详细信息(list)
@PostMapping
(
path
=
"/ShowCabinetList"
,
name
=
"查询单警柜列表"
)
@ApiOperation
(
"查询单警柜列表"
)
@ApiOperation
(
"查询单警柜列表"
)
public
ApiRes
<
List
<
CabinetDto
>>
showCabinetList
(
@RequestBody
CabinetReq
req
){
public
ApiRes
<
List
<
CabinetDto
>>
showCabinetList
(
@RequestBody
CabinetReq
req
){
List
<
CabinetDto
>
allCabinetList
=
cabinetService
.
getAllCabinetList
(
req
);
List
<
CabinetDto
>
allCabinetList
=
cabinetService
.
getAllCabinetList
(
req
);
return
ApiRes
.
success
(
allCabinetList
);
return
ApiRes
.
success
(
allCabinetList
);
}
}
//根据组织机构id查询出单警柜的详细信息(page)
@PostMapping
(
path
=
"/ShowCabinetPage"
,
name
=
"查询单警柜列表"
)
@PostMapping
(
path
=
"/ShowCabinetPage"
,
name
=
"查询单警柜列表
#enable
"
)
@ApiOperation
(
"查询单警柜列表"
)
@ApiOperation
(
"查询单警柜列表"
)
public
ApiRes
<
PageResult
<
CabinetDto
>>
ShowCabinetPage
(
@RequestBody
CabinetReq
req
){
public
ApiRes
<
PageResult
<
CabinetDto
>>
ShowCabinetPage
(
@RequestBody
CabinetReq
req
){
return
ApiRes
.
success
(
cabinetService
.
ShowCabinetPage
(
req
));
return
ApiRes
.
success
(
cabinetService
.
ShowCabinetPage
(
req
));
...
@@ -105,17 +103,7 @@ public class CabinetController {
...
@@ -105,17 +103,7 @@ public class CabinetController {
// @PostMapping("/boxBindPolice")
@PostMapping
(
path
=
"/SearchOrgId"
,
name
=
"根据单警柜id查询组织机构id#enable"
)
// @ApiOperation("箱门绑定人员")
// public ApiRes<Boolean> boxBindPolice(@RequestBody CabinetBoxReq req) {
// boolean result = cabinetService.boxBindPolice(req);
// if (!result){
// return ApiRes.failure("操作失败");
// }
// return ApiRes.success(result);
// }
@PostMapping
(
path
=
"/SearchOrgId"
,
name
=
"根据单警柜id查询组织机构id"
)
@ApiOperation
(
"/根据单警柜id查询组织机构id"
)
@ApiOperation
(
"/根据单警柜id查询组织机构id"
)
public
ApiRes
<
Long
>
SearchOrgId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetReq
req
){
public
ApiRes
<
Long
>
SearchOrgId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetReq
req
){
return
ApiRes
.
success
(
cabinetService
.
SearchOrgId
(
req
));
return
ApiRes
.
success
(
cabinetService
.
SearchOrgId
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DestoryUnitController.java
View file @
547c5f2d
...
@@ -43,14 +43,14 @@ public class DestoryUnitController {
...
@@ -43,14 +43,14 @@ public class DestoryUnitController {
}
}
//查询报废/销毁单位(list)
//查询报废/销毁单位(list)
@PostMapping
(
path
=
"/ShowDestoryUnitList"
,
name
=
"查询报废/销毁单位(list)"
)
@PostMapping
(
path
=
"/ShowDestoryUnitList"
,
name
=
"查询报废/销毁单位(list)
#enable
"
)
@ApiOperation
(
"查询报废/销毁单位(list)"
)
@ApiOperation
(
"查询报废/销毁单位(list)"
)
public
ApiRes
<
List
<
DestoryUnit
>>
showDestoryUnitList
(
@RequestBody
DestoryUnitReq
req
){
public
ApiRes
<
List
<
DestoryUnit
>>
showDestoryUnitList
(
@RequestBody
DestoryUnitReq
req
){
return
ApiRes
.
success
(
destoryUnitService
.
showDestoryUnitList
(
req
));
return
ApiRes
.
success
(
destoryUnitService
.
showDestoryUnitList
(
req
));
}
}
//查询报废/销毁单位(page)
//查询报废/销毁单位(page)
@PostMapping
(
path
=
"/ShowDestoryUnitPage"
,
name
=
"修改报废/销毁单位(page)"
)
@PostMapping
(
path
=
"/ShowDestoryUnitPage"
,
name
=
"修改报废/销毁单位(page)
#enable
"
)
@ApiOperation
(
"修改报废/销毁单位(page)"
)
@ApiOperation
(
"修改报废/销毁单位(page)"
)
public
ApiRes
<
PageResult
<
DestoryUnit
>>
showDestoryUnitPage
(
@RequestBody
DestoryUnitReq
req
){
public
ApiRes
<
PageResult
<
DestoryUnit
>>
showDestoryUnitPage
(
@RequestBody
DestoryUnitReq
req
){
return
ApiRes
.
success
(
destoryUnitService
.
showDestoryUnitPage
(
req
));
return
ApiRes
.
success
(
destoryUnitService
.
showDestoryUnitPage
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java
View file @
547c5f2d
...
@@ -48,13 +48,13 @@ public class DeviceConfigController {
...
@@ -48,13 +48,13 @@ public class DeviceConfigController {
return
ApiRes
.
success
(
deviceConfigService
.
updateDeviceConfig
(
req
));
return
ApiRes
.
success
(
deviceConfigService
.
updateDeviceConfig
(
req
));
}
}
//查询配置Page
//查询配置Page
@PostMapping
(
"/showDeviceConfigPag
e"
)
@PostMapping
(
path
=
"/showDeviceConfigPage"
,
name
=
"查询配置Page#enabl
e"
)
@ApiOperation
(
"查询配置Page"
)
@ApiOperation
(
"查询配置Page"
)
public
ApiRes
<
PageResult
<
DeviceConfig
>>
showDeviceConfigPage
(
@RequestBody
QueryDeviceConfigReq
req
){
public
ApiRes
<
PageResult
<
DeviceConfig
>>
showDeviceConfigPage
(
@RequestBody
QueryDeviceConfigReq
req
){
return
ApiRes
.
success
(
deviceConfigService
.
showDeviceConfigPage
(
req
));
return
ApiRes
.
success
(
deviceConfigService
.
showDeviceConfigPage
(
req
));
}
}
//查询配置List
//查询配置List
@PostMapping
(
"/showDeviceConfigList
"
)
@PostMapping
(
path
=
"/showDeviceConfigList"
,
name
=
"查询配置List#enable
"
)
@ApiOperation
(
"查询配置List"
)
@ApiOperation
(
"查询配置List"
)
public
ApiRes
<
List
<
DeviceConfig
>>
showDeviceConfigList
(
@RequestBody
QueryDeviceConfigReq
req
){
public
ApiRes
<
List
<
DeviceConfig
>>
showDeviceConfigList
(
@RequestBody
QueryDeviceConfigReq
req
){
return
ApiRes
.
success
(
deviceConfigService
.
showDeviceConfigList
(
req
));
return
ApiRes
.
success
(
deviceConfigService
.
showDeviceConfigList
(
req
));
...
@@ -73,7 +73,7 @@ public class DeviceConfigController {
...
@@ -73,7 +73,7 @@ public class DeviceConfigController {
return
ApiRes
.
success
(
warehouseDevService
.
updateWarehouseDev
(
req
));
return
ApiRes
.
success
(
warehouseDevService
.
updateWarehouseDev
(
req
));
}
}
//查看除湿机配置
//查看除湿机配置
@PostMapping
(
"/showWarehouseDevList
"
)
@PostMapping
(
path
=
"/showWarehouseDevList"
,
name
=
"查看除湿机配置#enable
"
)
@ApiOperation
(
"查看除湿机配置"
)
@ApiOperation
(
"查看除湿机配置"
)
public
ApiRes
<
List
<
WarehouseDev
>>
showWarehouseDevList
(
@RequestBody
@Validated
(
ValidationApi
.
list
.
class
)
UpdateWarehouseDevReq
req
){
public
ApiRes
<
List
<
WarehouseDev
>>
showWarehouseDevList
(
@RequestBody
@Validated
(
ValidationApi
.
list
.
class
)
UpdateWarehouseDevReq
req
){
return
ApiRes
.
success
(
warehouseDevService
.
showWarehouseDevList
(
req
));
return
ApiRes
.
success
(
warehouseDevService
.
showWarehouseDevList
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java
View file @
547c5f2d
...
@@ -48,19 +48,19 @@ public class EquipmentSizeController {
...
@@ -48,19 +48,19 @@ public class EquipmentSizeController {
return
ApiRes
.
success
(
equipmentSizeService
.
deleteSize
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
deleteSize
(
req
));
}
}
@PostMapping
(
"/GetOneSiz
e"
)
@PostMapping
(
path
=
"/GetOneSize"
,
name
=
"查询单个号型信息#enabl
e"
)
@ApiOperation
(
"查询单个号型信息"
)
@ApiOperation
(
"查询单个号型信息"
)
public
ApiRes
<
EquipmentSize
>
getOneSize
(
@RequestBody
QueryEquipmentSizeReq
req
)
{
public
ApiRes
<
EquipmentSize
>
getOneSize
(
@RequestBody
QueryEquipmentSizeReq
req
)
{
//ResponseResult returnMsg =
//ResponseResult returnMsg =
return
ApiRes
.
success
(
equipmentSizeService
.
getOneSize
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
getOneSize
(
req
));
}
}
@PostMapping
(
"/ShowSiz
e"
)
@PostMapping
(
path
=
"/ShowSize"
,
name
=
"根据装备类型查询号型#enabl
e"
)
@ApiOperation
(
"根据装备类型查询号型"
)
@ApiOperation
(
"根据装备类型查询号型"
)
public
ApiRes
<
List
<
EquipmentSizeDto
>>
getAllSize
(
@RequestBody
QueryEquipmentSizeReq
req
){
public
ApiRes
<
List
<
EquipmentSizeDto
>>
getAllSize
(
@RequestBody
QueryEquipmentSizeReq
req
){
return
ApiRes
.
success
(
equipmentSizeService
.
getAllSize
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
getAllSize
(
req
));
}
}
@PostMapping
(
"/GetSizePag
e"
)
@PostMapping
(
path
=
"/GetSizePage"
,
name
=
"分页查询号型信息#enabl
e"
)
@ApiOperation
(
"分页查询号型信息"
)
@ApiOperation
(
"分页查询号型信息"
)
public
ApiRes
<
PageResult
<
EquipmentSizeDto
>>
getSizePage
(
@RequestBody
QueryEquipmentSizeReq
req
){
public
ApiRes
<
PageResult
<
EquipmentSizeDto
>>
getSizePage
(
@RequestBody
QueryEquipmentSizeReq
req
){
return
ApiRes
.
success
(
equipmentSizeService
.
getSizePages
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
getSizePages
(
req
));
...
@@ -79,7 +79,7 @@ public class EquipmentSizeController {
...
@@ -79,7 +79,7 @@ public class EquipmentSizeController {
}
}
//根据typeId返回号型名称
//根据typeId返回号型名称
@PostMapping
(
"/searchByTypeIds
"
)
@PostMapping
(
path
=
"/searchByTypeIds"
,
name
=
"根据装备类型返回装备号型名称#enable
"
)
@ApiOperation
(
"/根据装备类型返回装备号型名称"
)
@ApiOperation
(
"/根据装备类型返回装备号型名称"
)
public
ApiRes
<
List
<
String
>>
searchByTypeIds
(
@RequestBody
QueryEquipmentSizeReq
req
){
public
ApiRes
<
List
<
String
>>
searchByTypeIds
(
@RequestBody
QueryEquipmentSizeReq
req
){
return
ApiRes
.
success
(
equipmentSizeService
.
getByTypeIds
(
req
));
return
ApiRes
.
success
(
equipmentSizeService
.
getByTypeIds
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
View file @
547c5f2d
...
@@ -49,23 +49,25 @@ public class EquipmentTypeController {
...
@@ -49,23 +49,25 @@ public class EquipmentTypeController {
return
ApiRes
.
success
(
equipmentTypeService
.
changeEquipmentState
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
changeEquipmentState
(
req
));
}
}
@PostMapping
(
"/ShowEquipmentList
"
)
@PostMapping
(
path
=
"/ShowEquipmentList"
,
name
=
"查询类别列表#enable
"
)
@ApiOperation
(
"查询类别列表"
)
@ApiOperation
(
"查询类别列表"
)
public
ApiRes
<
List
<
EquipmentTypeDto
>>
ShowEquipmentList
(
@RequestBody
QueryEquipmentTypeReq
req
)
{
public
ApiRes
<
List
<
EquipmentTypeDto
>>
ShowEquipmentList
(
@RequestBody
QueryEquipmentTypeReq
req
)
{
return
ApiRes
.
success
(
equipmentTypeService
.
getEquipmentList
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
getEquipmentList
(
req
));
}
}
@PostMapping
(
"/ShowEquipmentESList"
)
@PostMapping
(
path
=
"/ShowEquipmentESList"
,
name
=
"查看业务单#enable"
)
@ApiOperation
(
"通过ES模糊检索类别列表"
)
@ApiOperation
(
"通过ES模糊检索类别列表"
)
public
ApiRes
<
ESTypeDto
>
ShowEquipmentESList
(
@RequestBody
QueryEquipmentTypeReq
req
)
throws
IOException
{
public
ApiRes
<
ESTypeDto
>
ShowEquipmentESList
(
@RequestBody
QueryEquipmentTypeReq
req
)
throws
IOException
{
return
ApiRes
.
success
(
equipmentTypeService
.
getTypeTreeByEs
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
getTypeTreeByEs
(
req
));
}
}
@PostMapping
(
"/GetEquipmentDetail"
)
@PostMapping
(
path
=
"/GetEquipmentDetail"
,
name
=
"查询单个物资信息#enable"
)
@ApiOperation
(
"查询单个物资信息"
)
@ApiOperation
(
"查询单个物资信息"
)
public
ApiRes
<
EquipmentTypeDto
>
getEquipment
(
@RequestBody
QueryEquipmentTypeReq
req
)
{
public
ApiRes
<
EquipmentTypeDto
>
getEquipment
(
@RequestBody
QueryEquipmentTypeReq
req
)
{
return
ApiRes
.
success
(
equipmentTypeService
.
getEquipment
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
getEquipment
(
req
));
}
}
@PostMapping
(
"/getLowTyp
e"
)
@PostMapping
(
path
=
"/getLowType"
,
name
=
"根据上级物资查询下一级信息#enabl
e"
)
@ApiOperation
(
"根据上级物资查询下一级信息"
)
@ApiOperation
(
"根据上级物资查询下一级信息"
)
public
ApiRes
<
List
<
EquipmentTypeDto
>>
getLowType
(
@RequestBody
QueryEquipmentTypeReq
req
)
{
public
ApiRes
<
List
<
EquipmentTypeDto
>>
getLowType
(
@RequestBody
QueryEquipmentTypeReq
req
)
{
return
ApiRes
.
success
(
equipmentTypeService
.
getLowType
(
req
))
;
return
ApiRes
.
success
(
equipmentTypeService
.
getLowType
(
req
))
;
...
@@ -87,7 +89,8 @@ public class EquipmentTypeController {
...
@@ -87,7 +89,8 @@ public class EquipmentTypeController {
}
}
//返回整棵物资树
//返回整棵物资树
@PostMapping
(
"/GetTypeTree"
)
@PostMapping
(
path
=
"/GetTypeTree"
,
name
=
"获取整棵物资树#enable"
)
@ApiOperation
(
"/获取整棵物资树"
)
@ApiOperation
(
"/获取整棵物资树"
)
public
ApiRes
<
List
<
EquipmentTreeDto
>>
GetTypeTree
(
@RequestBody
QueryEquipmentTypeReq
req
){
public
ApiRes
<
List
<
EquipmentTreeDto
>>
GetTypeTree
(
@RequestBody
QueryEquipmentTypeReq
req
){
return
ApiRes
.
success
(
equipmentTypeService
.
GetTypeTree
(
req
));
return
ApiRes
.
success
(
equipmentTypeService
.
GetTypeTree
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
View file @
547c5f2d
...
@@ -85,40 +85,42 @@ public class InventoryController {
...
@@ -85,40 +85,42 @@ public class InventoryController {
}
}
//根据Epc获取装备信息
//根据Epc获取装备信息
@PostMapping
(
"/GetInvInfoByEpc"
)
@PostMapping
(
path
=
"/GetInvInfoByEpc"
,
name
=
"根据EPC列表获取装备信息#enable"
)
@ApiOperation
(
"根据EPC列表获取装备信息"
)
@ApiOperation
(
"根据EPC列表获取装备信息"
)
public
ApiRes
<
List
<
InventoryDto
>>
GetInvInfoByEpc
(
@RequestBody
InventoryReq
req
){
public
ApiRes
<
List
<
InventoryDto
>>
GetInvInfoByEpc
(
@RequestBody
InventoryReq
req
){
return
ApiRes
.
success
(
inventoryService
.
GetInvInfoByEpc
(
req
));
return
ApiRes
.
success
(
inventoryService
.
GetInvInfoByEpc
(
req
));
}
}
//根据组织机构id/单警柜id/仓库id查询出库存的汇总信息(page)
//根据组织机构id/单警柜id/仓库id查询出库存的汇总信息(page)
@PostMapping
(
"/GetEquipmentInfo"
)
@PostMapping
(
path
=
"/GetEquipmentInfo"
,
name
=
"根据条件查询库存汇总信息#enable"
)
@ApiOperation
(
"根据条件查询库存汇总信息"
)
@ApiOperation
(
"根据条件查询库存汇总信息"
)
public
ApiRes
<
PageResult
<
InventorySummary
>>
getEquipmentInfo
(
@RequestBody
InventorySumReq
req
)
{
public
ApiRes
<
PageResult
<
InventorySummary
>>
getEquipmentInfo
(
@RequestBody
InventorySumReq
req
)
{
return
ApiRes
.
success
(
inventorySummaryService
.
getEquipmentInfo
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
getEquipmentInfo
(
req
));
}
}
@PostMapping
(
"/GetEquipmentSummary"
)
@PostMapping
(
path
=
"/GetEquipmentSummary"
,
name
=
"根据条件查询库存汇总信息#enable"
)
@ApiOperation
(
"根据条件查询库存汇总信息(仅类型)"
)
@ApiOperation
(
"根据条件查询库存汇总信息(仅类型)"
)
public
ApiRes
<
PageResult
<
InventorySummary
>>
GetEquipmentSummary
(
@RequestBody
@Validated
(
ValidationApi
.
page
.
class
)
InventorySumReq
req
)
{
public
ApiRes
<
PageResult
<
InventorySummary
>>
GetEquipmentSummary
(
@RequestBody
@Validated
(
ValidationApi
.
page
.
class
)
InventorySumReq
req
)
{
return
ApiRes
.
success
(
inventorySummaryService
.
GetEquipmentSummary
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
GetEquipmentSummary
(
req
));
}
}
@PostMapping
(
"/GetEquipmentSummaryDetail
"
)
@PostMapping
(
path
=
"/GetEquipmentSummaryDetail"
,
name
=
"根据条件查询库存汇总信息#enable
"
)
@ApiOperation
(
"根据条件查询库存汇总信息(号型)"
)
@ApiOperation
(
"根据条件查询库存汇总信息(号型)"
)
public
ApiRes
<
List
<
InventorySummary
>>
GetEquipmentSummaryDetail
(
@RequestBody
InventorySumReq
req
)
{
public
ApiRes
<
List
<
InventorySummary
>>
GetEquipmentSummaryDetail
(
@RequestBody
InventorySumReq
req
)
{
return
ApiRes
.
success
(
inventorySummaryService
.
GetEquipmentSummaryDetail
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
GetEquipmentSummaryDetail
(
req
));
}
}
//根据条件查询仓库/单警柜下的所有装备信息
//根据条件查询仓库/单警柜下的所有装备信息
@PostMapping
(
"/GetDetailByTerms
"
)
@PostMapping
(
path
=
"/GetDetailByTerms"
,
name
=
"根据条件查询仓库#enable
"
)
@ApiOperation
(
"根据条件查询仓库/单警柜下的所有装备信息"
)
@ApiOperation
(
"根据条件查询仓库/单警柜下的所有装备信息"
)
public
ApiRes
<
PageResult
<
InventoryDto
>>
GetDetailByTerms
(
@RequestBody
@Validated
(
ValidationApi
.
export
.
class
)
InventoryReq
req
){
public
ApiRes
<
PageResult
<
InventoryDto
>>
GetDetailByTerms
(
@RequestBody
@Validated
(
ValidationApi
.
export
.
class
)
InventoryReq
req
){
return
ApiRes
.
success
(
inventoryService
.
GetDetailByTerms
(
req
));
return
ApiRes
.
success
(
inventoryService
.
GetDetailByTerms
(
req
));
}
}
@PostMapping
(
path
=
"/getOne"
,
name
=
"获取单个库存的数量#enable"
)
@PostMapping
(
"/getOne"
)
@ApiOperation
(
"获取单个库存的数量"
)
@ApiOperation
(
"获取单个库存的数量"
)
public
ApiRes
<
InventorySummary
>
getOne
(
@RequestBody
InventorySumReq
req
){
public
ApiRes
<
InventorySummary
>
getOne
(
@RequestBody
InventorySumReq
req
){
return
ApiRes
.
success
(
inventorySummaryService
.
getOne
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
getOne
(
req
));
...
@@ -127,7 +129,7 @@ public class InventoryController {
...
@@ -127,7 +129,7 @@ public class InventoryController {
//根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额(和getEquipmentInfo同时调用,汇总出符合查询条件的装备)
//根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额(和getEquipmentInfo同时调用,汇总出符合查询条件的装备)
@PostMapping
(
"/getTotalNumberAndPric
e"
)
@PostMapping
(
path
=
"/getTotalNumberAndPrice"
,
name
=
"查询总金额以及各个汇总数量#enabl
e"
)
@ApiOperation
(
"查询总金额以及各个汇总数量"
)
@ApiOperation
(
"查询总金额以及各个汇总数量"
)
public
ApiRes
<
List
<
InventorySummary
>>
getTotalNumberAndPrice
(
@RequestBody
InventorySumReq
req
){
public
ApiRes
<
List
<
InventorySummary
>>
getTotalNumberAndPrice
(
@RequestBody
InventorySumReq
req
){
return
ApiRes
.
success
(
inventorySummaryService
.
getTotalNumberAndPrice
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
getTotalNumberAndPrice
(
req
));
...
@@ -135,21 +137,23 @@ public class InventoryController {
...
@@ -135,21 +137,23 @@ public class InventoryController {
//根据装备id查询出装备的详细信息
//根据装备id查询出装备的详细信息
@PostMapping
(
"/GetDetail
"
)
@PostMapping
(
path
=
"/GetDetail"
,
name
=
"根据装备id查询装备明细信息#enable
"
)
@ApiOperation
(
"根据装备id查询装备明细信息"
)
@ApiOperation
(
"根据装备id查询装备明细信息"
)
public
ApiRes
<
InventoryDto
>
getInventoryDetail
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
InventoryReq
req
)
{
public
ApiRes
<
InventoryDto
>
getInventoryDetail
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
InventoryReq
req
)
{
return
ApiRes
.
success
(
inventoryService
.
getInventoryDetail
(
req
));
return
ApiRes
.
success
(
inventoryService
.
getInventoryDetail
(
req
));
}
}
//查询箱门(cabinetBox下)所有装备简要信息列表(传递cabinetBoxId)
//查询箱门(cabinetBox下)所有装备简要信息列表(传递cabinetBoxId)
@PostMapping
(
"/searchEqsByBoxId"
)
@PostMapping
(
path
=
"/searchEqsByBoxId"
,
name
=
"查询某一箱门下的所有装备简要信息#enable"
)
@ApiOperation
(
"查询某一箱门下的所有装备简要信息(list)"
)
@ApiOperation
(
"查询某一箱门下的所有装备简要信息(list)"
)
public
ApiRes
<
List
<
EqsBriefDto
>>
searchEqsByBoxId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
public
ApiRes
<
List
<
EqsBriefDto
>>
searchEqsByBoxId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
return
ApiRes
.
success
(
inventoryService
.
searchEqsByBoxId
(
req
));
return
ApiRes
.
success
(
inventoryService
.
searchEqsByBoxId
(
req
));
}
}
//查询箱门(cabinetBox下)所有装备简要信息列表page(传递cabinetBoxId)
//查询箱门(cabinetBox下)所有装备简要信息列表page(传递cabinetBoxId)
@PostMapping
(
"/searchEqsByBoxIdPage"
)
@PostMapping
(
path
=
"/searchEqsByBoxIdPage"
,
name
=
"查询某一箱门下的所有装备简要信息#enable"
)
@ApiOperation
(
"查询某一箱门下的所有装备简要信息(page)"
)
@ApiOperation
(
"查询某一箱门下的所有装备简要信息(page)"
)
public
ApiRes
<
PageResult
<
EqsBriefDto
>>
searchEqsByBoxIdPage
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
public
ApiRes
<
PageResult
<
EqsBriefDto
>>
searchEqsByBoxIdPage
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
return
ApiRes
.
success
(
inventoryService
.
searchEqsByBoxIdPage
(
req
));
return
ApiRes
.
success
(
inventoryService
.
searchEqsByBoxIdPage
(
req
));
...
@@ -157,54 +161,61 @@ public class InventoryController {
...
@@ -157,54 +161,61 @@ public class InventoryController {
//查询单警柜箱门下的汇总信息(传递cabinetBoxId)
//查询单警柜箱门下的汇总信息(传递cabinetBoxId)
@PostMapping
(
"/EqsByCabinetBoxId"
)
@PostMapping
(
path
=
"/EqsByCabinetBoxId"
,
name
=
"查询箱门下的汇总信息#enable"
)
@ApiOperation
(
"查询箱门下的汇总信息(list)"
)
@ApiOperation
(
"查询箱门下的汇总信息(list)"
)
public
ApiRes
<
List
<
InventorySummary
>>
EqsByCabinetBoxId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
public
ApiRes
<
List
<
InventorySummary
>>
EqsByCabinetBoxId
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
return
ApiRes
.
success
(
inventoryService
.
EqsByCabinetBoxId
(
req
));
return
ApiRes
.
success
(
inventoryService
.
EqsByCabinetBoxId
(
req
));
}
}
//查询单警柜箱门下的汇总信息(传递cabinetBoxId)
//查询单警柜箱门下的汇总信息(传递cabinetBoxId)
@PostMapping
(
"/EqsByCabinetBoxIdPage"
)
@PostMapping
(
path
=
"/EqsByCabinetBoxIdPage"
,
name
=
"查询箱门下的汇总信息#enable"
)
@ApiOperation
(
"查询箱门下的汇总信息(page)"
)
@ApiOperation
(
"查询箱门下的汇总信息(page)"
)
public
ApiRes
<
PageResult
<
InventorySummary
>>
EqsByCabinetBoxIdPage
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
public
ApiRes
<
PageResult
<
InventorySummary
>>
EqsByCabinetBoxIdPage
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
CabinetBoxReq
req
){
return
ApiRes
.
success
(
inventoryService
.
EqsByCabinetBoxIdPage
(
req
));
return
ApiRes
.
success
(
inventoryService
.
EqsByCabinetBoxIdPage
(
req
));
}
}
//根据货架id查询装备信息汇总(list)
//根据货架id查询装备信息汇总(list)
@PostMapping
(
"/ShelfInventoryList"
)
@PostMapping
(
path
=
"/ShelfInventoryList"
,
name
=
"根据货架id查询装备信息汇总#enable"
)
@ApiOperation
(
"根据货架id查询装备信息汇总(list)"
)
@ApiOperation
(
"根据货架id查询装备信息汇总(list)"
)
public
ApiRes
<
List
<
InventorySummary
>>
ShelfInventoryList
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
ShelfReq
req
){
public
ApiRes
<
List
<
InventorySummary
>>
ShelfInventoryList
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
ShelfReq
req
){
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryList
(
req
));
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryList
(
req
));
}
}
//根据货架id查询装备信息汇总 (page)
//根据货架id查询装备信息汇总 (page)
@PostMapping
(
"/ShelfInventoryPage"
)
@PostMapping
(
path
=
"/ShelfInventoryPage"
,
name
=
"根据货架id查询装备信息汇总#enable"
)
@ApiOperation
(
"根据货架id查询装备信息汇总(page)"
)
@ApiOperation
(
"根据货架id查询装备信息汇总(page)"
)
public
ApiRes
<
PageResult
<
InventorySummary
>>
ShelfInventoryPage
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
ShelfReq
req
){
public
ApiRes
<
PageResult
<
InventorySummary
>>
ShelfInventoryPage
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
ShelfReq
req
){
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryPage
(
req
));
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryPage
(
req
));
}
}
@PostMapping
(
"/ShelfInventoryDetail"
)
@PostMapping
(
path
=
"/ShelfInventoryDetail"
,
name
=
"通过货架id查询每件装备信息简要#enable"
)
@ApiOperation
((
"/通过货架id查询每件装备信息简要(list)"
))
@ApiOperation
((
"/通过货架id查询每件装备信息简要(list)"
))
public
ApiRes
<
List
<
EqsBriefDto
>>
AreaInventoryDetail
(
@RequestBody
@Validated
(
ValidationApi
.
list
.
class
)
InventoryReq
req
){
public
ApiRes
<
List
<
EqsBriefDto
>>
AreaInventoryDetail
(
@RequestBody
@Validated
(
ValidationApi
.
list
.
class
)
InventoryReq
req
){
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryDetail
(
req
));
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryDetail
(
req
));
}
}
@PostMapping
(
"/ShelfEqsPage"
)
@PostMapping
(
path
=
"/ShelfEqsPage"
,
name
=
"通过货架id查询每件装备信息简要#enable"
)
@ApiOperation
((
"/通过货架id查询每件装备信息简要(page)"
))
@ApiOperation
((
"/通过货架id查询每件装备信息简要(page)"
))
public
ApiRes
<
PageResult
<
EqsBriefDto
>>
ShelfInventoryPage
(
@RequestBody
@Validated
(
ValidationApi
.
list
.
class
)
InventoryReq
req
){
public
ApiRes
<
PageResult
<
EqsBriefDto
>>
ShelfInventoryPage
(
@RequestBody
@Validated
(
ValidationApi
.
list
.
class
)
InventoryReq
req
){
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryPage
(
req
));
return
ApiRes
.
success
(
inventoryService
.
ShelfInventoryPage
(
req
));
}
}
//根据区域id查询装备信息汇总(list)
//根据区域id查询装备信息汇总(list)
@PostMapping
(
"/AreaInventoryList"
)
@PostMapping
(
path
=
"/AreaInventoryList"
,
name
=
"根据区域id查询装备信息汇总#enable"
)
@ApiOperation
(
"根据区域id查询装备信息汇总(list)"
)
@ApiOperation
(
"根据区域id查询装备信息汇总(list)"
)
public
ApiRes
<
List
<
InventorySummary
>>
AreaInventoryList
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
WarehouseAreaReq
req
){
public
ApiRes
<
List
<
InventorySummary
>>
AreaInventoryList
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
WarehouseAreaReq
req
){
return
ApiRes
.
success
(
inventoryService
.
AreaInventoryList
(
req
));
return
ApiRes
.
success
(
inventoryService
.
AreaInventoryList
(
req
));
}
}
//根据区域id查询装备信息汇总(page)
//根据区域id查询装备信息汇总(page)
@PostMapping
(
"/AreaInventoryPag
e"
)
@PostMapping
(
path
=
"/AreaInventoryPage"
,
name
=
"根据区域id查询装备信息汇总#enabl
e"
)
@ApiOperation
(
"根据区域id查询装备信息汇总(page)"
)
@ApiOperation
(
"根据区域id查询装备信息汇总(page)"
)
public
ApiRes
<
PageResult
<
InventorySummary
>>
AreaInventoryPage
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
WarehouseAreaReq
req
){
public
ApiRes
<
PageResult
<
InventorySummary
>>
AreaInventoryPage
(
@RequestBody
@Validated
(
ValidationApi
.
edit
.
class
)
WarehouseAreaReq
req
){
return
ApiRes
.
success
(
inventoryService
.
AreaInventoryPage
(
req
));
return
ApiRes
.
success
(
inventoryService
.
AreaInventoryPage
(
req
));
...
@@ -220,7 +231,8 @@ public class InventoryController {
...
@@ -220,7 +231,8 @@ public class InventoryController {
//根据条件(组织机构,装备类型id,装备型号id,装备型号名称)查询装备总数,在库数,出库数,单警柜在库数,单警柜出库数,报废数
//根据条件(组织机构,装备类型id,装备型号id,装备型号名称)查询装备总数,在库数,出库数,单警柜在库数,单警柜出库数,报废数
//查询装备数量报表
//查询装备数量报表
@PostMapping
(
"/GetListEquipment"
)
@PostMapping
(
path
=
"/GetListEquipment"
,
name
=
"根据条件查询数量汇总#enable"
)
@ApiOperation
(
"根据条件查询数量汇总"
)
@ApiOperation
(
"根据条件查询数量汇总"
)
public
ApiRes
<
List
<
EqsSumDto
>>
GetListEquipment
(
@RequestBody
InventoryReq
req
){
public
ApiRes
<
List
<
EqsSumDto
>>
GetListEquipment
(
@RequestBody
InventoryReq
req
){
return
ApiRes
.
success
(
inventoryService
.
GetListEquipment
(
req
));
return
ApiRes
.
success
(
inventoryService
.
GetListEquipment
(
req
));
...
@@ -235,7 +247,8 @@ public class InventoryController {
...
@@ -235,7 +247,8 @@ public class InventoryController {
//根据仓库id和orgId查询出库存中存在的装备typeId
//根据仓库id和orgId查询出库存中存在的装备typeId
//根据仓库id,orgId,type_id 查询出装备号型sizeId
//根据仓库id,orgId,type_id 查询出装备号型sizeId
//根据仓库id,orgId,typeId,sizeId查询出单价和对应的数量
//根据仓库id,orgId,typeId,sizeId查询出单价和对应的数量
@PostMapping
(
"/GetInventorySumInfo"
)
@PostMapping
(
path
=
"/GetInventorySumInfo"
,
name
=
"查询出库存中的装备信息#enable"
)
@ApiOperation
(
"查询出库存中的装备信息"
)
@ApiOperation
(
"查询出库存中的装备信息"
)
public
ApiRes
<
List
<
InventorySumDto
>>
GetInventorySumInfo
(
@RequestBody
InventorySumReq
req
){
public
ApiRes
<
List
<
InventorySumDto
>>
GetInventorySumInfo
(
@RequestBody
InventorySumReq
req
){
return
ApiRes
.
success
(
inventorySummaryService
.
GetInventorySumInfo
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
GetInventorySumInfo
(
req
));
...
@@ -271,13 +284,15 @@ public class InventoryController {
...
@@ -271,13 +284,15 @@ public class InventoryController {
return
ApiRes
.
success
(
inventorySummaryService
.
insertToSummary
());
return
ApiRes
.
success
(
inventorySummaryService
.
insertToSummary
());
}
}
@PostMapping
(
"/selectTotalNum"
)
@PostMapping
(
path
=
"/selectTotalNum"
,
name
=
"根据组织机构和装备查询库存#enable"
)
@ApiOperation
(
"根据组织机构和装备查询库存"
)
@ApiOperation
(
"根据组织机构和装备查询库存"
)
public
ApiRes
<
List
<
InventorySumDto
>>
selectTotalNum
(
@RequestBody
SelectTotalNumReq
req
){
public
ApiRes
<
List
<
InventorySumDto
>>
selectTotalNum
(
@RequestBody
SelectTotalNumReq
req
){
return
ApiRes
.
success
(
inventorySummaryService
.
selectTotalNum
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
selectTotalNum
(
req
));
}
}
@PostMapping
(
"/selectSumByItems"
)
@PostMapping
(
path
=
"/selectSumByItems"
,
name
=
"通过条件查询库存汇总#enable"
)
@ApiOperation
(
"通过条件查询库存汇总"
)
@ApiOperation
(
"通过条件查询库存汇总"
)
public
ApiRes
<
List
<
InventorySummary
>>
selectSumByItems
(
@RequestBody
SelectTotalNumReq
req
){
public
ApiRes
<
List
<
InventorySummary
>>
selectSumByItems
(
@RequestBody
SelectTotalNumReq
req
){
return
ApiRes
.
success
(
inventorySummaryService
.
selectSumByItems
(
req
));
return
ApiRes
.
success
(
inventorySummaryService
.
selectSumByItems
(
req
));
...
...
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
View file @
547c5f2d
...
@@ -41,18 +41,18 @@ public class PubOrgController {
...
@@ -41,18 +41,18 @@ public class PubOrgController {
ResponseResult
returnMsg
=
pubOrgService
.
setShortName
(
orgId
);
ResponseResult
returnMsg
=
pubOrgService
.
setShortName
(
orgId
);
return
returnMsg
;
return
returnMsg
;
}
}
@PostMapping
(
path
=
"/GetOrgList"
,
name
=
"查询组织机构列表#enable"
)
@PostMapping
(
"/GetOrgList"
)
@ApiOperation
(
"查询组织机构列表"
)
@ApiOperation
(
"查询组织机构列表"
)
public
ApiRes
<
List
<
OrgDto
>>
getOrgList
(
@RequestBody
QueryOrgReq
req
)
{
public
ApiRes
<
List
<
OrgDto
>>
getOrgList
(
@RequestBody
QueryOrgReq
req
)
{
return
ApiRes
.
success
(
pubOrgService
.
getOrgList
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
getOrgList
(
req
));
}
}
@PostMapping
(
"/GetCurrentList
"
)
@PostMapping
(
path
=
"/GetCurrentList"
,
name
=
"根据当前组织机构列表查询#enable
"
)
@ApiOperation
(
"根据当前组织机构列表查询"
)
@ApiOperation
(
"根据当前组织机构列表查询"
)
public
ApiRes
<
OrgDto
>
GetCurrentList
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
QueryOrgReq
req
)
{
public
ApiRes
<
OrgDto
>
GetCurrentList
(
@RequestBody
@Validated
(
ValidationApi
.
detail
.
class
)
QueryOrgReq
req
)
{
return
ApiRes
.
success
(
pubOrgService
.
getOrgHierarchy
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
getOrgHierarchy
(
req
));
}
}
@PostMapping
(
"/GetCurrentESList"
)
@PostMapping
(
path
=
"/GetCurrentESList"
,
name
=
"根据当前组织机构列表ES查询#enable"
)
@ApiOperation
(
"根据当前组织机构列表ES查询"
)
@ApiOperation
(
"根据当前组织机构列表ES查询"
)
public
ApiRes
<
ESOrgDto
>
GetCurrentESList
(
@RequestBody
QueryOrgReq
req
)
throws
IOException
{
public
ApiRes
<
ESOrgDto
>
GetCurrentESList
(
@RequestBody
QueryOrgReq
req
)
throws
IOException
{
return
ApiRes
.
success
(
pubOrgService
.
getOrgTreeByEs
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
getOrgTreeByEs
(
req
));
...
@@ -62,13 +62,14 @@ public class PubOrgController {
...
@@ -62,13 +62,14 @@ public class PubOrgController {
public
ApiRes
<
Boolean
>
changeOrgState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateOrgReq
req
)
{
public
ApiRes
<
Boolean
>
changeOrgState
(
@RequestBody
@Validated
(
ValidationApi
.
updateStatus
.
class
)
UpdateOrgReq
req
)
{
return
ApiRes
.
success
(
pubOrgService
.
ChangeState
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
ChangeState
(
req
));
}
}
@PostMapping
(
"/GetLowOrg"
)
@PostMapping
(
path
=
"/GetLowOrg"
,
name
=
"根据组织机构查询下一级信息#enable"
)
@ApiOperation
(
"根据组织机构查询下一级信息"
)
@ApiOperation
(
"根据组织机构查询下一级信息"
)
public
ApiRes
<
List
<
OrgDto
>>
getLowOrg
(
@RequestBody
QueryOrgReq
req
)
{
public
ApiRes
<
List
<
OrgDto
>>
getLowOrg
(
@RequestBody
QueryOrgReq
req
)
{
return
ApiRes
.
success
(
pubOrgService
.
getLowOrg
(
req
))
;
return
ApiRes
.
success
(
pubOrgService
.
getLowOrg
(
req
))
;
}
}
//通过组织机构id获取上一层的组织机构数据
//通过组织机构id获取上一层的组织机构数据
@PostMapping
(
"getUpOrgInfo
"
)
@PostMapping
(
path
=
"/getUpOrgInfo"
,
name
=
"获取上级组织机构信息#enable
"
)
@ApiOperation
(
"获取上级组织机构信息"
)
@ApiOperation
(
"获取上级组织机构信息"
)
public
ApiRes
<
OrgDto
>
getUpOrgInfo
(
@RequestBody
QueryOrgReq
req
){
public
ApiRes
<
OrgDto
>
getUpOrgInfo
(
@RequestBody
QueryOrgReq
req
){
return
ApiRes
.
success
(
pubOrgService
.
getUpOrgInfo
(
req
));
return
ApiRes
.
success
(
pubOrgService
.
getUpOrgInfo
(
req
));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论