#质检

zhou zhou

8 小时以前 3501e5999d41943149974383129f899479d0b3d2

#质检

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java

@@ -1,18 +1,13 @@
package com.vincent.rsf.server.api.controller.pda;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.PdaOtherService;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@Api(tags = "PDA综合操作接口")
@RequestMapping("/pda")
@@ -30,4 +25,24 @@

        return pdaOtherService.transferPage(orderNo,curr,limit);
    }


    @PostMapping(value = "/other/inspectList")
    public R inspectList(@RequestBody PdaGeneralParam generalParam) {

        return pdaOtherService.inspectList(generalParam);
    }

    @PostMapping(value = "/other/inspectConfirm")
    public R inspectConfirm(@RequestBody PdaGeneralParam generalParam) {

        return pdaOtherService.inspectConfirm(generalParam);
    }

    @PostMapping(value = "/other/inspectConfirm2")
    public R inspectConfirm2(@RequestBody PdaGeneralParam generalParam) {

        return pdaOtherService.inspectConfirm2(generalParam);
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java

@@ -1,7 +1,10 @@
package com.vincent.rsf.server.api.entity.params;

import com.vincent.rsf.server.manager.entity.LocItem;
import lombok.Data;
import lombok.experimental.Accessors;

import java.util.List;

@Data
@Accessors(chain = true)
@@ -11,5 +14,9 @@
    private String containerNo;
    // 接驳站号
    private String transferStationNo;
    //物料号
    private String matnrCode;

    private List<LocItem> matnrList;

}

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOtherService.java

@@ -1,7 +1,14 @@
package com.vincent.rsf.server.api.service;

import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;

public interface PdaOtherService {
    R transferPage(String orderNo, Integer curr, Integer limit);

    R inspectList(PdaGeneralParam generalParam);

    R inspectConfirm(PdaGeneralParam generalParam);

    R inspectConfirm2(PdaGeneralParam generalParam);
}

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOtherServiceImpl.java

@@ -4,19 +4,32 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.PdaOtherService;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.LocItem;
import com.vincent.rsf.server.manager.entity.Transfer;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.LocStatusType;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.manager.service.TransferService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
public class PdaOtherServiceImpl implements PdaOtherService {

    @Autowired
    private TransferService transferService;

    @Autowired
    private LocService locService;
    @Autowired
    private LocItemService locItemService;

    @Override
    public R transferPage(String orderNo, Integer curr, Integer limit) {
@@ -26,4 +39,78 @@
        Page<Transfer> page1 = transferService.page(page, transferLambdaQueryWrapper);
        return R.ok(page1);
    }

    @Override
    public R inspectList(PdaGeneralParam generalParam) {
       if (Cools.isEmpty(generalParam.getContainerNo())) {
           throw new CoolException("容器码为空");
       }
       Loc loc = null;
       try {
           loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, generalParam.getContainerNo()));
       }catch (Exception e){
           throw new CoolException("数据错误,查询到多条库位");
       }
       if (Cools.isEmpty(loc)) {
           throw new CoolException("未找到对应的库位");
       }
       if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)){
           throw new CoolException("库位不为在库状态");
       }
        List<LocItem> list = locItemService.list(new LambdaQueryWrapper<LocItem>()
                .eq(LocItem::getLocId, loc.getId())
                .eq(!Cools.isEmpty(generalParam.getMatnrCode()),LocItem::getMatnrCode, generalParam.getMatnrCode())
        );
       if (Cools.isEmpty(list)) {
           throw new CoolException("库位为在库状态,但库位为空");
       }
       return R.ok(list);

    }

    @Override
    public R inspectConfirm(PdaGeneralParam generalParam) {
        if (Cools.isEmpty(generalParam.getMatnrList())){
            throw new CoolException("参数为空");
        }
        for (LocItem locItem : generalParam.getMatnrList()) {
            LocItem locItem1 = locItemService.getById(locItem.getId());
            if (Cools.isEmpty(locItem1)) {
                throw new CoolException("数据错误");
            }
            if (locItem1.getStatus().equals(LocStatusType.FREEZE.type)){
                continue;
            }
            if (locItem.getStatus().equals(LocStatusType.FREEZE.type)){
                locItem1.setStatus(LocStatusType.FREEZE.type);
                locItemService.updateById(locItem1);
            }


        }
        return R.ok();
    }

    @Override
    public R inspectConfirm2(PdaGeneralParam generalParam) {
        if (Cools.isEmpty(generalParam.getMatnrList())){
            throw new CoolException("参数为空");
        }
        for (LocItem locItem : generalParam.getMatnrList()) {
            LocItem locItem1 = locItemService.getById(locItem.getId());
            if (Cools.isEmpty(locItem1)) {
                throw new CoolException("数据错误");
            }
            if (locItem1.getStatus().equals(LocStatusType.NORMAL.type)){
                continue;
            }
            if (locItem.getStatus().equals(LocStatusType.NORMAL.type)){
                locItem1.setStatus(LocStatusType.NORMAL.type);
                locItemService.updateById(locItem1);
            }


        }
        return R.ok();
    }
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/LocStatusType.java

New file
@@ -0,0 +1,30 @@
package com.vincent.rsf.server.manager.enums;

public enum LocStatusType {

    //空板
    NORMAL(1, "正常"),
    FREEZE(0,"冻结"),
    ;

    public Integer type;

    public String desc;

    LocStatusType(Integer type, String desc) {
        this.type = type;
        this.desc = desc;
    }


    public static LocStatusType get(String el) {
        for (LocStatusType value : LocStatusType.values()) {
            if (el.equals(value.toString())) {
                return value;
            }
        }
        return null;
    }


}