diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/MdPbPapervehicle.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/MdPbPapervehicle.java index ed1a7de11..cfb1bf200 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/MdPbPapervehicle.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/dao/MdPbPapervehicle.java @@ -53,7 +53,7 @@ public class MdPbPapervehicle implements Serializable { /** * 修改时间 */ - private Long update_optid; + private String update_optid; /** * 修改人 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java index 4b1bb439c..c9f0a05cb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java @@ -1,5 +1,6 @@ package org.nl.b_lms.bst.ivt.stockingivt.controller; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** * @author lyd * @date 2024-02-26 @@ -29,15 +31,15 @@ public class BstIvtStockingivtController { @GetMapping @Log("查询备货区点位库存表") //@SaCheckPermission("@el.check('bstIvtStockingivt:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(bstIvtStockingivtService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(bstIvtStockingivtService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增备货区点位库存表") //@SaCheckPermission("@el.check('bstIvtStockingivt:add')") public ResponseEntity - create(@Validated @RequestBody BstIvtStockingivt entity){ + create(@Validated @RequestBody BstIvtStockingivt entity) { bstIvtStockingivtService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -45,7 +47,7 @@ public class BstIvtStockingivtController { @PutMapping @Log("修改备货区点位库存表") //@SaCheckPermission("@el.check('bstIvtStockingivt:edit')") - public ResponseEntity update(@Validated @RequestBody BstIvtStockingivt entity){ + public ResponseEntity update(@Validated @RequestBody BstIvtStockingivt entity) { bstIvtStockingivtService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -58,5 +60,12 @@ public class BstIvtStockingivtController { return new ResponseEntity<>(HttpStatus.OK); } + @Log("操作管芯托盘库存") + //@SaCheckPermission("@el.check('bstIvtStockingivt:del')") + @PostMapping("operateIvt") + public ResponseEntity operateIvt(@RequestBody JSONObject param) { + return new ResponseEntity<>(bstIvtStockingivtService.operateIvt(param), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java index 167aea813..d87e371b8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java @@ -1,5 +1,6 @@ package org.nl.b_lms.bst.ivt.stockingivt.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; @@ -75,4 +76,6 @@ public interface IBstIvtStockingivtService extends IService { * @return / */ BstIvtStockingivt getCanMovePointOne(String location, String pointType); + + JSONObject operateIvt(JSONObject jsonObject) ; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java index 6eadb146a..79e60fc21 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java @@ -2,12 +2,16 @@ package org.nl.b_lms.bst.ivt.stockingivt.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService; +import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.domain.query.PageQuery; @@ -16,6 +20,7 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import java.util.List; @@ -23,8 +28,8 @@ import java.util.Map; import java.util.Set; /** - * @description 服务实现 * @author lyd + * @description 服务实现 * @date 2024-02-26 **/ @Slf4j @@ -33,9 +38,11 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); bstIvtStockingivtMapper.selectPage(pages, lam); @@ -102,4 +109,54 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl().eq(MdPbPapervehicle::getVehicle_code, vehicle_code) + .eq(MdPbPapervehicle::getRow_num, row_num)); + if (ObjectUtil.isNotEmpty(papervehicle) && !papervehicle.getMaterial_code().equals(material_code)) { + throw new BadRequestException("当前排物料为【" + papervehicle.getMaterial_code() + "】,与绑定的物料不同,如需要请先清除库存,再进行绑定!"); + } + if (ObjectUtil.isNotEmpty(papervehicle)) { + papervehicle.setQty(jsonObject.getBigDecimal("qty")); + papervehicle.setUpdate_optid(currentUserId); + papervehicle.setUpdate_optname(nickName); + papervehicle.setUpdate_time(now); + PapervehicleService.updateById(papervehicle); + } else { + papervehicle = new MdPbPapervehicle(); + papervehicle.setIvt_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + papervehicle.setVehicle_code(vehicle_code); + papervehicle.setRow_num(row_num); + papervehicle.setMaterial_code(material_code); + papervehicle.setMaterial_name(material_name); + papervehicle.setQty(jsonObject.getBigDecimal("qty")); + papervehicle.setUpdate_optid(currentUserId); + papervehicle.setUpdate_optname(nickName); + papervehicle.setUpdate_time(now); + PapervehicleService.save(papervehicle); + } + } + + if (type.equals("2")) { + PapervehicleService.remove(new LambdaQueryWrapper().eq(MdPbPapervehicle::getVehicle_code, vehicle_code) + .eq(MdPbPapervehicle::getRow_num, row_num)); + } + JSONObject result = new JSONObject(); + result.put("status", HttpStatus.OK.value()); + result.put("message", "操作成功!"); + return result; + } }