Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-12-20 3695eb9fa6062ef00e685835cf384c02e60f7b17

Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -91,8 +91,15 @@
        // 0.出库模式，1.agv入库中，2.生成入库任务
        if (basDevp.getDevMk().equals("0")) { // 是出库
             // 判断是否有出库任务
            int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                    .eq("sta_no", inSta).lt("wrk_sts",14).in("io_type",101,103,107,110));
            Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
            switch (inSta) {
                case "1040": wrapper.in("source_sta_no","1043","1044");break;
                case "2010": wrapper.in("source_sta_no","2013","2014"); break;
                case "2000": wrapper.in("source_sta_no","2003","2004");break;
                case "3010": wrapper.in("source_sta_no","3013","3014");break;
                default:
            }
            int count = wrkMastService.selectCount(wrapper);
            if (count == 0) {
                // 没有出库任务，更改为入库模式
                basDevp.setDevMk("1");
@@ -131,10 +138,10 @@
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            jsonObject.getString("message");
            if (jsonObject.getInteger("code").equals(0)) {
                success = true;
            } else {
                message = jsonObject.getString("message");
                log.error("入库呼叫agv失败！！！url：{}；request：{}；response：{}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
            }
        } catch (Exception e) {

 src/main/java/com/zy/common/utils/OutStockInterceptUtil.java

@@ -1,6 +1,7 @@
package com.zy.common.utils;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
@@ -24,9 +25,10 @@
    public static final Map<Integer,Boolean> inSiteMap = new HashMap<Integer,Boolean>();

    static {
        inSiteMap.put(1040, true);
        inSiteMap.put(2010, true);inSiteMap.put(2000, true);
        inSiteMap.put(3010, true);
        inSiteMap.put(1040, true);inSiteMap.put(1042, true);
        inSiteMap.put(2010, true);inSiteMap.put(2012, true);
        inSiteMap.put(2000, true);inSiteMap.put(2002, true);
        inSiteMap.put(3010, true);inSiteMap.put(3012, true);
    }

    /**
@@ -44,8 +46,19 @@
            } else if (devMk.equals("2")) {
                 // 判断该站点入库任务是否完成
                WrkMastMapper wrkMastMapper = SpringUtils.getBean(WrkMastMapper.class);
                int count = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>()
                        .eq("source_sta_no", site).in("io_type",1,10,53,57));
                Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().in("io_type", 1, 10, 53, 57);
                switch (site) {
                    case 1040: wrapper.in("sta_no","1043","1044");break;
                    case 1042: wrapper.in("sta_no","1043","1044");break;
                    case 2010: wrapper.in("sta_no","2013","2014"); break;
                    case 2012: wrapper.in("sta_no","2013","2014"); break;
                    case 2000: wrapper.in("sta_no","2003","2004");break;
                    case 2002: wrapper.in("sta_no","2003","2004");break;
                    case 3010: wrapper.in("sta_no","3013","3014");break;
                    case 3012: wrapper.in("sta_no","3013","3014");break;
                    default:
                }
                int count = wrkMastMapper.selectCount(wrapper);
                if (count == 0) {
                    basDevp.setDevMk("0"); // 没有入库任务，切换成出库模式
                    basDevpMapper.updateById(basDevp);

 src/main/webapp/static/js/basDevp/basDevp.js

@@ -22,7 +22,7 @@
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'devNo', align: 'center',sort:true,title: '编号'}
            // ,{field: 'decDesc', align: 'center',title: '设备描述'}
            // ,{field: 'devMk', align: 'center',title: '备注'}
            ,{field: 'devMk', align: 'center',title: '出入状态'}
            ,{field: 'inEnable', align: 'center',title: '可入', templet:function(row){
                    var html = "<input value='inEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.inEnable === 'Y'){html += " checked ";}

 src/main/webapp/views/basDevp/basDevp_detail.html

@@ -30,12 +30,12 @@
            </div>
        </div>

        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">备　　注：</label>
            <div class="layui-input-inline">
                <input id="devMk" class="layui-input" type="text">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">备　　注：</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="devMk" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">可　　入：</label>
            <div class="layui-input-inline">
@@ -234,10 +234,16 @@
                <input id="cartPos" class="layui-input" type="text">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label">设备描述：</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="decDesc" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">设备描述：</label>
            <label class="layui-form-label">站点出入状态</label>
            <div class="layui-input-inline">
                <input id="decDesc" class="layui-input" type="text">
                <input id="devMk" class="layui-input" type="text">
            </div>
        </div>