出库单明细功能优化

skyouc

7 天以前 d2ea33b96cb1394b5546b1bfc557c1c984e4bc5b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java

@@ -11,15 +11,19 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.LocType;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.service.LocTypeService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库位类型")
@RestController
public class LocTypeController extends BaseController {

@@ -59,11 +63,26 @@
        if (Objects.isNull(locType.getName())) {
            throw new CoolException("库位类型不能为空！！");
        }
        if (Objects.isNull(locType.getCode())) {
            throw new CoolException("库位编码不为空！！");
        }
        if (Objects.isNull(locType.getRegex())) {
            throw new CoolException("库位规则表达式不能为空！！");
        }

        locType.setCreateBy(getLoginUserId());
        locType.setUpdateBy(getLoginUserId());
        List<LocType> list = locTypeService.list(new LambdaQueryWrapper<LocType>()
                .eq(LocType::getCode, locType.getCode()));
        if (!list.isEmpty()) {
            throw new CoolException("编码不能重复！！");
        }
        List<LocType> groups = locTypeService.list(new LambdaQueryWrapper<LocType>()
                .eq(LocType::getName, locType.getName()));
        if (!groups.isEmpty()) {
            throw new CoolException("名称已存在，请勿重复添加！！");
        }

        if (!locTypeService.save(locType)) {
            return R.error("Save Fail");
        }
@@ -73,9 +92,32 @@
    @PreAuthorize("hasAuthority('manager:locType:update')")
    @OperationLog("Update loc type")
    @PostMapping("/locType/update")
    @Transactional(rollbackFor = Exception.class)
    public R update(@RequestBody LocType locType) {
        if (Objects.isNull(locType.getName())) {
            throw new CoolException("库位类型不能为空！！");
        }
        if (Objects.isNull(locType.getCode())) {
            throw new CoolException("库位编码不为空！！");
        }
        if (Objects.isNull(locType.getRegex())) {
            throw new CoolException("库位规则表达式不能为空！！");
        }

        LocType locType1 = locTypeService.getById(locType.getId());
        if (!locType.getName().equals(locType1.getName())) {
            List<LocType> areasList = locTypeService.list(new LambdaQueryWrapper<LocType>().eq(LocType::getName, locType.getName()));
            if (!areasList.isEmpty()) {
                throw new CoolException("仓库名已存在！！");
            }
        }
        if (!locType.getCode().equals(locType1.getCode())) {
            List<LocType> locTypeList = locTypeService.list(new LambdaQueryWrapper<LocType>().eq(LocType::getCode, locType.getCode()));
            if (!locTypeList.isEmpty()) {
                throw new CoolException("仓库编码已存在！！");
            }
        }
        locType.setUpdateBy(getLoginUserId());
        locType.setUpdateTime(new Date());
        if (!locTypeService.updateById(locType)) {
            return R.error("Update Fail");
        }