#平板入

zhou zhou

1 天以前 e549bc25fce8679682e7698c9ad725dfaf37d82c

#平板入

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

@@ -256,6 +256,12 @@
        LocMast locMast = service.selectById(this.locNo);
        if (!Cools.isEmpty(locMast)){
            return String.valueOf(locMast.getLocNo());
        }else {
            LocCacheService service2 = SpringUtils.getBean(LocCacheService.class);
            LocCache locCache = service2.selectOne(new EntityWrapper<LocCache>().eq("loc_no", this.locNo));
            if (!Cools.isEmpty(locCache)){
                return String.valueOf(locCache.getLocNo());
            }
        }
        return null;
    }

 src/main/java/com/zy/asrs/entity/result/CrnTaskDetlDTO.java

New file
@@ -0,0 +1,18 @@
package com.zy.asrs.entity.result;

import com.zy.asrs.entity.LocDetl;
import lombok.Data;
import lombok.experimental.Accessors;


import java.util.List;

@Data
@Accessors(chain = true)
public class CrnTaskDetlDTO {

    private String locNo;

    private List<LocDetl> locDetlList;

}

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

@@ -8,10 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.entity.result.ForwardAGVTaskDTO;
import com.zy.asrs.entity.result.HIKApiDTO;
import com.zy.asrs.entity.result.HIKResultDTO;
import com.zy.asrs.entity.result.*;
import com.zy.asrs.enums.*;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
@@ -2118,7 +2115,7 @@
        }
        Collections.shuffle(devps);
        BasDevp basDevp = devps.stream().findFirst().get();
        List<LocMast> locMasts = new ArrayList<>();
        List<CrnTaskDetlDTO> locMasts = new ArrayList<>();
        Map<String, List<LocDetl>> listMap = locDetls.stream().collect(Collectors.groupingBy(LocDetl::getMatnr));
        //获取查库存总数量
        AtomicReference<Double> totalOut = new AtomicReference<>(0.0);
@@ -2162,7 +2159,8 @@
                            if (sum.compareTo(v) <= 0 && sum.compareTo(itemed.get()) > 0) {
                                itemed.set(Math.round((itemed.get() + v) * 10000) / 10000.0);
                                // 可放下
                                locMasts.add(locMast);
                                CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(adetls);
                                locMasts.add(crnTaskDetlDTO);
                                totalOut.set(Math.round((totalOut.get() + itemed.get()) * 10000) / 10000.0);
                            }
                        }
@@ -2181,9 +2179,10 @@
                    .eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
                    .orderAsc(Arrays.asList("row1", "bay1", "lev1"))
                    .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
            locMasts.add(locMast);
            CrnTaskDetlDTO crnTaskDetlDTO = new CrnTaskDetlDTO().setLocNo(locMast.getLocNo()).setLocDetlList(locDetls);
            locMasts.add(crnTaskDetlDTO);
            // 空板出库
            generateTask(locMasts, TaskIOType.EMPTY_OUT.type, basDevp, userId);
            generateTask(locMasts, TaskIOType.MERGE_OUT.type, basDevp, userId);
        }
    }

@@ -2195,47 +2194,51 @@
     * @date 2025/12/6 14:44
     */
    @Transactional(rollbackFor = Exception.class)
    public void generateTask(List<LocMast> locMasts, Integer ioType, BasDevp devp, Long userId) {
    public void generateTask(List<CrnTaskDetlDTO> locMasts, Integer ioType, BasDevp devp, Long userId) {
        Date now = new Date();
        for (LocMast locMast : locMasts) {

        for (CrnTaskDetlDTO crnTaskDetlDTO : locMasts) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", crnTaskDetlDTO.getLocNo()));
            if (Objects.isNull(ioType)) {
                continue;
            }
            Integer outSta = devp.getDevNo();
            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo()));
            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
            WrkMast wrkMast = new WrkMast();
            wrkMast.setWrkNo(workNo);
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(ioType); // 入出库类型
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 源站
            wrkMast.setStaNo(staDesc.getStnNo() + ""); // 目标站
            wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("N"); // 空板
            wrkMast.setLinkMis("N");
            wrkMast.setBarcode(locMast.getBarcode());
            wrkMast.setAppeUser(userId); // 操作人员数据
            wrkMast.setAppeTime(now);
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号：" + locMast.getLocNo());
            if (Cools.isEmpty(wrkMast1)){
                Integer outSta = devp.getDevNo();
                // 获取路径
                StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);

                // 生成工作档
                WrkMast wrkMast = new WrkMast();
                wrkMast.setWrkNo(workNo);
                wrkMast.setIoTime(now);
                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
                wrkMast.setIoType(ioType); // 入出库类型
                wrkMast.setIoPri(13D); // 优先级：13
                wrkMast.setCrnNo(locMast.getCrnNo());
                wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 源站
                wrkMast.setStaNo(staDesc.getStnNo() + ""); // 目标站
                wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                wrkMast.setFullPlt("Y"); // 满板：Y
                wrkMast.setPicking("N"); // 拣料
                wrkMast.setExitMk("N"); // 退出
                wrkMast.setEmptyMk("N"); // 空板
                wrkMast.setLinkMis("N");
                wrkMast.setBarcode(locMast.getBarcode());
                wrkMast.setAppeUser(userId); // 操作人员数据
                wrkMast.setAppeTime(now);
                wrkMast.setModiUser(userId);
                wrkMast.setModiTime(now);
                if (!wrkMastService.insert(wrkMast)) {
                    throw new CoolException("保存工作档失败，出库库位号：" + locMast.getLocNo());
                }
            }else {
                workNo = wrkMast1.getWrkNo();
            }

            List<LocDetl> locDetls = locDetlService
                    .selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));

            // 生成工作档明细
            for (LocDetl detlDto : locDetls) {
            for (LocDetl detlDto : crnTaskDetlDTO.getLocDetlList()) {
                WrkDetl wrkDetl = new WrkDetl();
                BeanUtils.copyProperties(detlDto, wrkDetl);
                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号

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

@@ -245,6 +245,9 @@
        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
            List<TaskDetl> wrkDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", wrkMast.getWrkNo()));
            for (TaskDetl wrkDetl : wrkDetls) {
                if (Cools.isEmpty(wrkDetl.getOrderNo())){
                    continue;
                }
                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                    OrderInAndOutUtil.decrease(Boolean.FALSE, wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
                            wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
@@ -254,7 +257,7 @@
                    boolean flag = true;
                    OrderPakin order =  orderService.selectByNo(wrkDetl.getOrderNo());  //OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
                    if (Objects.isNull(order)) {
                        throw new CoolException("单据信息不存在！！");
                        continue;
                    }
                    List<OrderDetlPakin> orderDetls = orderDetlService.selectByOrderId(order.getId()); //OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
                    for (OrderDetlPakin orderDetl : orderDetls) {

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -7,7 +7,8 @@
        ,{field: 'matnr', align: 'center',title: '商品编号', sort:true}
        ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
        ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}
        ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
        ,{field: 'threeCode', align: 'center',title: 'BS Code', sort:true}
        ,{field: 'standby1', align: 'center',title: '供应商代码', sort:true}
        ,{field: 'anfme', align: 'center',title: '可用数量'}
        ,{field: 'diffQty', align: 'center',title: '差异数量',
            templet: function(d) {

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -129,6 +129,9 @@
    {{#if (d.ioType === 107) { }}
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">盘</a>
    {{# } }}
    {{#if (d.ioType === 104) { }}
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">并</a>
    {{# } }}
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>