修改了判断空库位，查询语句的bug,和摄像头的连接

zyh

8 天以前 c47395fe29493062a3f0bc2cf1d02a2946b20b88

修改了判断空库位，查询语句的bug,和摄像头的连接

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -269,8 +269,11 @@
                        }});
                        String agvSta = "";
                        if (locMast.getLocType3() == 2) {
                            agvSta = "Z-LZP26";
                        }else if (locType == 2){

                        } else {
                        }
                        else {
                            agvSta = orderPakout.getCstmrName();//agv目标站点位置
                        }
                        WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam, ioPri, agvSta);

 src/main/java/com/zy/asrs/entity/WrkMastLog.java

@@ -30,6 +30,7 @@
    private Long id;

    @ApiModelProperty("日志ID")
    @TableField("log_id")
    private Long logId;

    /**

 src/main/java/com/zy/common/service/CommonService.java

@@ -177,7 +177,22 @@
                .orderBy("lev1")
                .orderBy("bay1")
                .orderBy("row1"));
        if (locMast == null) {
        if (locMast == null && locTypeDto.getLocType1() ==1) {
            LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "O")
                    .eq("loc_type1", locTypeDto.getLocType1() + 1)
                    .eq("loc_type2", locTypeDto.getLocType2())
                    .orderBy("lev1")
                    .orderBy("bay1")
                    .orderBy("row1"));
            if (locMast1 == null){
                log.error("入库请求库位失败：无库位" + locTypeDto.getLocType1());
                throw new CoolException("入库请求库位失败：无库位" + locTypeDto.getLocType1());
            }else {
                locMast =locMast1;
            }

        }else if (locMast ==null){
            log.error("入库请求库位失败：无库位" + locTypeDto.getLocType1());
            throw new CoolException("入库请求库位失败：无库位" + locTypeDto.getLocType1());
        }

 src/main/java/com/zy/common/web/BaseController.java

@@ -121,6 +121,14 @@
        // 全字段模糊搜索 todo
        if (!Cools.isEmpty(map.get("condition"))) {
            Set<String> columns = new HashSet<>();
            // 创建一个临时map，排除condition参数和分页排序参数
            Map<String, Object> tempMap = new HashMap<>(map);
            tempMap.remove("condition");
            tempMap.remove("curr");
            tempMap.remove("limit");
            tempMap.remove("orderByField");
            tempMap.remove("orderByType");
            
            for (Field field : Cools.getAllFields(cls)){
                if (Modifier.isFinal(field.getModifiers())
                        || Modifier.isStatic(field.getModifiers())
@@ -134,7 +142,7 @@
                if (Cools.isEmpty(column)) {
                    column = field.getName();
                }
                if (!map.keySet().contains(column)) {
                if (!tempMap.keySet().contains(column)) {
                    columns.add(column);
                }
            }
@@ -154,6 +162,14 @@
        if (Cools.isEmpty(condition)) {
            return;
        }
        // 创建一个新的集合，排除condition参数本身
        Set<String> excludeSet = new HashSet<>(set);
        excludeSet.remove("condition");
        excludeSet.remove("curr");
        excludeSet.remove("limit");
        excludeSet.remove("orderByField");
        excludeSet.remove("orderByType");
        
        List<String> columns = new ArrayList<>();
        for (Field field :Cools.getAllFields(cls)){
            if (Modifier.isFinal(field.getModifiers())
@@ -168,7 +184,7 @@
            if (Cools.isEmpty(column)) {
                column = field.getName();
            }
            if (!set.contains(column)) {
            if (!excludeSet.contains(column)) {
                columns.add(column);
            }
        }

 src/main/java/com/zy/common/web/WcsController.java

@@ -90,7 +90,7 @@
        }

        //入库时对空板出库任务进行完成
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()).eq("wrk_sts",110));
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()).eq("io_type",110));
        if (!Cools.isEmpty(wrkMast)) {
            wrkMast.setWrkSts(15L);//空板出库任务转历史档
            wrkMastService.updateById(wrkMast);

 src/main/resources/application-dev.yml

@@ -130,7 +130,7 @@
  zpalletId: tuopan

wcs:
  url: 127.0.0.1:9094/wcs
  url: 172.26.160.202/

#mes对接
mes:

 src/main/resources/mapper/WrkMastLogMapper.xml

@@ -6,6 +6,7 @@
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastLog">
        <id column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="log_id" property="logId" />
        <result column="inv_wh" property="invWh" />
        <result column="ymd" property="ymd" />
        <result column="mk" property="mk" />