#

zhou zhou

7 小时以前 5ed4c86f13606a64e32757b0e17bb0721f75f299

#

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

@@ -1228,11 +1228,14 @@
     * @version 1.0
     */
    @Override
    @Transactional
    public synchronized R callAgvMove(AgvCallParams params, Long userId) {
        if (Objects.isNull(params.getOrgSite())) {
            throw new CoolException("源站点不能为空！！");
        }
        BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
        LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>()
                .eq("area_id",basAreas.getId())
                .eq("frozen", 0)
                .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
//                .eq("loc_no", params.getTarSite())
@@ -1242,7 +1245,12 @@
            throw new CoolException("请检查目标库位是否闲置中！！");
        }

        generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);
        try {
            generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);
        }catch (Exception e) {
            throw new CoolException(e.getMessage());
        }


        return R.ok();
    }
@@ -2209,7 +2217,7 @@
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public synchronized void generateAgvTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
    public void generateAgvTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
        List<WaitPakin> pakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
        if (Objects.isNull(pakins) || pakins.isEmpty()) {
            throw new CoolException("组托信息不存在！！");
@@ -2245,11 +2253,10 @@
            throw new CoolException("保存工作档失败");
        }

        List<TaskDetl> taskDetls = new ArrayList<>();
        pakins.forEach(pakin -> {
        for (WaitPakin pakin :pakins){
            TaskDetl wrkDetl = new TaskDetl();
            BeanUtils.copyProperties(pakin, wrkDetl);
            wrkDetl.setWrkNo(workNo)
            wrkDetl.setId(null).setWrkNo(workNo)
                    .setIoTime(new Date())
                    .setOrderNo(pakin.getOrderNo())
                    .setAnfme(pakin.getAnfme())
@@ -2262,22 +2269,22 @@
                    .setModel(pakin.getModel())
                    .setAppeTime(new Date())
                    .setModiUser(userId);
            taskDetls.add(wrkDetl);
        });
            if (!taskDetlService.insert(wrkDetl)){
                throw new CoolException("保存工作档明细失败");
            }

        //保存工作档明细
        if (!taskDetlService.insertBatch(taskDetls)) {
            throw new CoolException("保存工作档明细失败");
        }

        pakins.forEach(pakin -> {

        for (WaitPakin pakin : pakins){
            pakin.setIoStatus("Y");
        });

        if (!waitPakinService.updateBatchById(pakins)) {
            throw new CoolException("更新组托信息失败");
            if (!waitPakinService.updateById(pakin)) {
                throw new CoolException("更新组托信息失败");
            }
        }



        // 修改目标库位状态
        if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
            loc.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.入库预约

 src/main/webapp/static/js/common.js

@@ -252,7 +252,7 @@
    ,{field: 'zpallet', align: 'center',title: '托盘条码', hide: false}
    ,{field: 'length', align: 'center',title: '重量', hide: false}
    ,{field: 'volume', align: 'center',title: '尺寸', hide: false}
    ,{field: 'modiTime', align: 'center',title: '更新时间', hide: false}
    ,{field: 'modiTime$', align: 'center',title: '更新时间', hide: false}
    ,{field: 'supp', align: 'center',title: '供应商', hide: true}
    ,{field: 'specs', align: 'center',title: '规格', hide: true}
    ,{field: 'model', align: 'center',title: '代码', hide: true}

 src/main/webapp/views/taskLog/taskLog.html

@@ -89,7 +89,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/taskLog/taskLog.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>