diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java index 173fe994..30802649 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java @@ -1,8 +1,11 @@ package org.nl.wms.base_manage.material.controller; +import cn.dev33.satoken.annotation.SaIgnore; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; +import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.RedissonUtils; import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService; import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase; @@ -29,6 +32,7 @@ import java.util.Arrays; */ @RestController @RequestMapping("/api/bmMaterial") +@SaIgnore public class BmMaterialController { @Autowired @@ -52,6 +56,18 @@ public class BmMaterialController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/updateMaterialInfo") + public ResponseEntity updateMaterialInfo(@Validated @RequestBody MdMeMaterialbase dto) { + if (BigDecimal.ZERO.compareTo(dto.getSingle_weight()) == 0 || StringUtils.isBlank(dto.getMaterial_id())) { + throw new BadRequestException("物料信息有误,请检查!"); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(MdMeMaterialbase::getNearby_weight, dto.getSingle_weight()); + updateWrapper.eq(MdMeMaterialbase::getMaterial_id, dto.getMaterial_id()); + materialService.update(updateWrapper); + return new ResponseEntity<>(HttpStatus.OK); + } + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/dao/TaskInfo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/dao/TaskInfo.java index 47cd3cb6..47306370 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/dao/TaskInfo.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/dao/TaskInfo.java @@ -25,6 +25,7 @@ public class TaskInfo { private String task_type; private String material_name; private String material_code; + private String material_id; private String material_spec; //需出数量 private BigDecimal assign_qty; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/mapper/CockpitMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/mapper/CockpitMapper.xml index 99faa2d8..623b2c70 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/mapper/CockpitMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/cockpit/service/mapper/CockpitMapper.xml @@ -54,6 +54,7 @@ b.weight as vehicle_weight, p.`code` as task_type, d.vehicle_code, + m.material_id, m.material_name, m.material_spec, d.qty, diff --git a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml index 640ba270..49c5b190 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -77,7 +77,7 @@ - +