bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓储接收租赁装备推送逻辑优化，租赁退租时，查询装备状态以及修改装备状态的接口编写

This commit is contained in:
15856 2024-11-07 18:23:27 +08:00
parent 460ff3f287
commit 14dedd4725
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java
View File

@ -96,15 +96,15 @@ public class MaReceiveController extends BaseController {
@ApiOperation(value = "获取租赁设备状态") @ApiOperation(value = "获取租赁设备状态")
@GetMapping("/getItemStatus") @GetMapping("/getItemStatus")
public AjaxResult getDataReceiveDetailsById(Long itemId) { public AjaxResult getDataReceiveDetailsById(@RequestBody String maMachineRequest) {
Long itemStatus = maReceiveService.getItemStatus(itemId); Long itemStatus = maReceiveService.getItemStatus(maMachineRequest);
return success(itemStatus); return success(itemStatus);
} }
@ApiOperation(value = "修改租赁设备状态") @ApiOperation(value = "修改租赁设备状态")
@GetMapping("/updateItemStatus") @GetMapping("/updateItemStatus")
public AjaxResult updateItemStatus(DataReceiveDetail dataReceiveDetail) { public AjaxResult updateItemStatus(@RequestBody String maMachineRequest) {
Integer itemStatus = maReceiveService.updateItemStatus(dataReceiveDetail); Integer itemStatus = maReceiveService.updateItemStatus(maMachineRequest);
return success(itemStatus); return success(itemStatus);
} }
} }

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java
View File

@ -21,7 +21,7 @@ public interface MaReceiveService {
List<DataReceiveDetail> getDateReceiveMachine(DataReceiveDetail dataReceiveDetail); List<DataReceiveDetail> getDateReceiveMachine(DataReceiveDetail dataReceiveDetail);
Long getItemStatus(Long itemId); Long getItemStatus(String itemId);
Integer updateItemStatus(DataReceiveDetail dataReceiveDetail); Integer updateItemStatus(String dataReceiveDetail);
} }

14
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java
View File

@ -150,13 +150,21 @@ public class MaReceiveServiceImpl implements MaReceiveService {
} }
@Override @Override
public Long getItemStatus(Long itemId) { public Long getItemStatus(String itemId) {
return maMachineMapper.selectMaMachineByItemId(itemId); log.info("获取状态{}", itemId);
JSONObject object = JSONObject.parseObject(itemId);
itemId = object.getString("body");
DataReceiveDetail dataReceiveDetail = JSONObject.parseObject(itemId, DataReceiveDetail.class);
return maMachineMapper.selectMaMachineByItemId(dataReceiveDetail.getItemId());
} }
public Integer updateItemStatus(DataReceiveDetail dataReceiveDetail) { public Integer updateItemStatus(String dataReceiveDetailReq) {
log.info("修改状态{}", dataReceiveDetailReq);
JSONObject object = JSONObject.parseObject(dataReceiveDetailReq);
dataReceiveDetailReq = object.getString("body");
DataReceiveDetail dataReceiveDetail = JSONObject.parseObject(dataReceiveDetailReq, DataReceiveDetail.class);
if (dataReceiveDetail!=null && dataReceiveDetail.getOrderOverTime()!= null){ if (dataReceiveDetail!=null && dataReceiveDetail.getOrderOverTime()!= null){
return maReceiveMapper.updateOrderOverTime(dataReceiveDetail); return maReceiveMapper.updateOrderOverTime(dataReceiveDetail);
}else { }else {

2
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<update id="updateItemStatus"> <update id="updateItemStatus">
UPDATE ma_machine mm LEFT JOIN data_receive_detail drd on mm.ma_id = drd.ma_id UPDATE ma_machine mm LEFT JOIN data_receive_detail drd on mm.ma_id = drd.ma_id
SET mm.ma_status = 130 SET mm.ma_status = #{maStatus}
where drd.item_id = #{itemId} where drd.item_id = #{itemId}
</update> </update>