root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:载具维护异常

Browse Source
This commit is contained in:
gengby
2024-07-16 15:50:23 +08:00
parent 637c219e47
commit a3f52e6efd
4 changed files with 338 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/controller/MdPbVehicleMaterController.java
View File

@@ -2,11 +2,17 @@ package org.nl.wms.md_manage.vehicleMater.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
import org.nl.wms.md_manage.vehicleMater.service.dto.VehicleMaterQuery;
@@ -34,6 +40,8 @@ public class MdPbVehicleMaterController {
@Autowired
private IMdPbVehicleMaterService iMdPbVehicleMaterService;
@Autowired
private IMdMeMaterialbaseService materialbaseService;
@GetMapping()
@@ -41,6 +49,24 @@ public class MdPbVehicleMaterController {
return new ResponseEntity<>(TableDataInfo.build(iMdPbVehicleMaterService.page(page.build(), query.build())), HttpStatus.OK);
}
@GetMapping("/getMaterialByVehicle/{vehicle_code}")
public ResponseEntity<Object> getMaterialByVehicle(@PathVariable String vehicle_code) {
LambdaQueryWrapper<MdPbVehicleMater> lqw = new LambdaQueryWrapper<>();
lqw.eq(MdPbVehicleMater::getVehicle_code, vehicle_code);
MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(lqw);
JSONObject res = new JSONObject();
res.put("vehicle_code", vehicle_code);
if (ObjectUtil.isNotEmpty(one)) {
MdMeMaterialbase materialbase = materialbaseService.getById(one.getMaterial_id());
res.put("material_id", one.getMaterial_id());
res.put("pcsn", one.getPcsn());
res.put("material_code", materialbase.getMaterial_code());
res.put("storage_qty", one.getQty());
res.put("material_spec", materialbase.getMaterial_spec());
}
return new ResponseEntity<>(res, HttpStatus.OK);
}
@GetMapping("getVehicleMater/{code}")
public ResponseEntity<Object> vehicleInfo(@PathVariable String code) {
List<MdPbVehicleMater> dick_code = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>()
@@ -57,6 +83,26 @@ public class MdPbVehicleMaterController {
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/updateVehicleMaterial")
public ResponseEntity<Object> updateVehicleMaterial(@RequestBody JSONObject req) {
String vehicle_code = req.getString("vehicle_code");
Assert.notBlank(vehicle_code);
LambdaQueryWrapper<MdPbVehicleMater> lqw = new LambdaQueryWrapper<>();
lqw.eq(MdPbVehicleMater::getVehicle_code, vehicle_code);
MdPbVehicleMater one = iMdPbVehicleMaterService.getOne(lqw);
if (ObjectUtil.isEmpty(one)) {
throw new BadRequestException("载具物料表中不存在该载具信息!");
}
MdMeMaterialbase materialbase = materialbaseService.getOne(new LambdaQueryWrapper<MdMeMaterialbase>().eq(MdMeMaterialbase::getMaterial_code, req.getString("material_code")));
MdPbVehicleMater mater = new MdPbVehicleMater();
mater.setId(one.getId());
mater.setMaterial_id(materialbase.getMaterial_id());
mater.setPcsn(req.getString("pcsn"));
mater.setQty(req.getBigDecimal("storage_qty"));
iMdPbVehicleMaterService.updateById(mater);
return new ResponseEntity<>(HttpStatus.OK);
}
}