自动化立体仓库 - WMS系统
lsh
2024-06-02 138b5fc883c3ccb25f4bed7114a60f93e78aaa9a
#条码检测
1个文件已添加
4个文件已修改
62 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/AgvMobileController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -14,6 +14,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -167,6 +168,9 @@
                               @RequestParam(defaultValue = "10")Integer limit,
                               @RequestParam Map<String, Object> param){
        String devNo = param.get("devNo").toString();
        if (Cools.isEmpty(devNo) || !CodeDetectionUtil.carCodeDetection(devNo)){
            throw new CoolException(devNo + "小车地码有误,请正确扫码!!!");
        }
        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
        if("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())){
            //先去入库通知档找明细
src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -519,6 +519,9 @@
    @ManagerAuth(memo = "站点回退")
    @Synchronized
    public R doBack(@RequestBody AgvMobileStartPakin param){
        if (Cools.isEmpty(param)){
            return R.error("参数为空");
        }
        agvMobileService.doBack(param, getUserId());
        return R.ok();
    }
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.service.AgvCommonService;
import lombok.Synchronized;
@@ -67,6 +68,9 @@
    public String comb(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        if (!CodeDetectionUtil.barcodeDetection(param.getBarcode())){
            throw new CoolException(param.getBarcode() + "货架码有误,请正确扫码!!!");
        }
        param.setContainerType(Short.valueOf(param.getBarcode().substring(0,2)));
@@ -636,6 +640,12 @@
    @Override
    @Transactional
    public String doBack(AgvMobileStartPakin param, Long userId) {
        if (Cools.isEmpty(param.getBarcode()) || !CodeDetectionUtil.barcodeDetection(param.getBarcode())){
            throw new CoolException(param.getBarcode() + "货架码有误,请正确扫码!!!");
        }
        if (Cools.isEmpty(param.getDevNo()) || !CodeDetectionUtil.carCodeDetection(param.getDevNo())){
            throw new CoolException(param.getDevNo() + "小车地码有误,请正确扫码!!!");
        }
        Date now = new Date();
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", param.getDevNo()));
        AgvWrkMast agvWrkMastSource = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.getDevNo()));
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.SaasUtils;
import com.zy.asrs.utils.Utils;
@@ -80,6 +81,9 @@
//        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
//            throw new CoolException(BaseRes.PARAM);
//        }
        if (Cools.isEmpty(param.getBarcode()) || !CodeDetectionUtil.barcodeDetection(param.getBarcode())){
            throw new CoolException(param.getBarcode() + "货架码有误,请正确扫码!!!");
        }
        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -481,6 +485,9 @@
    @Transactional
    public void nodePutway(String zpallet, String locNo, User user) {
        Date now = new Date();
        if (Cools.isEmpty(zpallet) || !CodeDetectionUtil.barcodeDetection(zpallet)){
            throw new CoolException(zpallet + "货架码有误,请正确扫码!!!");
        }
        //增加平库库存
        List<WaitPakin> waitPakinList = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", zpallet));
src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java
New file
@@ -0,0 +1,38 @@
package com.zy.asrs.utils;
import java.util.regex.Pattern;
public class CodeDetectionUtil {
    /**
     * 检测货架码
     */
    public static boolean barcodeDetection(String barcode){
        Pattern pattern = Pattern.compile("\\d{6}");
        return pattern.matcher(barcode).matches();
    }
    /**
     * 检测小车地码
     */
    public static boolean carCodeDetection(String carCode){
        return carCode.contains("_");
    }
    public static void main(String[] args) {
        System.out.println("barcodeDetection:"+"22222222===>"+barcodeDetection("22222222"));
        System.out.println("barcodeDetection:"+"222222===>"+barcodeDetection("222222"));
        System.out.println("barcodeDetection:"+"111===>"+barcodeDetection("111"));
        System.out.println("barcodeDetection:"+"DB_123ss===>"+barcodeDetection("DB_123ss"));
        System.out.println("barcodeDetection:"+"12_1231===>"+barcodeDetection("12_1231"));
        System.out.println("barcodeDetection:"+"DB_123456===>"+barcodeDetection("DB_123456"));
        System.out.println("carCodeDetection:"+"22222222===>"+carCodeDetection("22222222"));
        System.out.println("carCodeDetection:"+"222222===>"+carCodeDetection("222222"));
        System.out.println("carCodeDetection:"+"111===>"+carCodeDetection("111"));
        System.out.println("carCodeDetection:"+"DB_123ss===>"+carCodeDetection("DB_123ss"));
        System.out.println("carCodeDetection:"+"12_1231===>"+carCodeDetection("12_1231"));
        System.out.println("carCodeDetection:"+"DB_123456===>"+carCodeDetection("DB_123456"));
    }
}