#

Junjie

2024-05-22 5989655fcf8c34f9091b1d328f8950dad8267725

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java

@@ -27,6 +27,12 @@
    List<Integer> getAvailableOutSite(Integer typeNo, Long hostId);

    /**
     * 空板出库站
     * @return
     */
    List<Integer> getAvailableEmptyOutSite(Long hostId);

    /**
     * 目标站点状态检测
     *
     * @param pakin 是否入库操作 true 是 ； false 不是

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java

@@ -230,10 +230,9 @@

            LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
                    .eq(LocMast::getLocSts, "O")
                    .eq(LocMast::getLocType1, 1)
                    .eq(LocMast::getLocType1, locTypeDto.getLocType1())
                    .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
                    .eq(LocMast::getHostId, hostId)
                    .orderByAsc(LocMast::getLev1, LocMast::getBay1, LocMast::getRow1);
                    .eq(LocMast::getHostId, hostId);

            //库位搜索范围
            LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java

@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Collections;
import java.util.List;

@Service("basDevpService")
@@ -35,6 +36,11 @@
    }

    @Override
    public List<Integer> getAvailableEmptyOutSite(Long hostId) {
        return this.baseMapper.getAvailableOutSite(110, hostId);
    }

    @Override
    public BasDevp checkSiteStatus(Integer devpNo, boolean pakin, Long hostId) {
        BasDevp station = this.getOne(new LambdaQueryWrapper<BasDevp>().eq(BasDevp::getDevNo, devpNo).eq(BasDevp::getHostId, hostId));
        if (station == null){

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java

@@ -426,7 +426,7 @@
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        }
        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 199) {
            throw new CoolException("当前工作档已完成");
        }
        // 入库 + 库位转移

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java

@@ -57,6 +57,9 @@
        if (!Cools.isEmpty(param.get("loc_no"))) {
            wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
        }
        if (!Cools.isEmpty(param.get("loc_sts"))) {
            wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
        }
        return R.ok(locMastService.page(new Page<>(curr, limit), wrapper));
    }


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java

@@ -132,6 +132,7 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        wrkMast.setHostId(hostId);
        wrkMast.setCrnNo(dto.getCrnNo());
        boolean res = wrkMastService.save(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
@@ -202,6 +203,7 @@
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setBarcode(barcode);
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(new Date());

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java

@@ -86,6 +86,12 @@
        return R.ok("入库启动成功").add(workService.emptyPlateIn(sourceStaNo, getUserId(), getHostId()));
    }

    @RequestMapping("/available/empty/take/site")
    @ManagerAuth()
    public R availableEmptyTakeSite(){
        return R.ok().add(basDevpService.getAvailableEmptyOutSite(getHostId()));
    }

    @RequestMapping("/plate/out/start")
    @ManagerAuth(memo = "出库作业")
    public R fullStoreTakeStart(@RequestBody StockOutParam param) {

 zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js

@@ -37,7 +37,7 @@
    tableIns = table.render({
        elem: '#locMast',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/locMast/list/auth',
        url: baseUrl+'/locMast/page/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],

 zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html

@@ -101,12 +101,12 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">修改时间：</label>
            <div class="layui-input-inline">
                <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">修改时间：</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">创 建 者：</label>
            <div class="layui-input-inline cool-auto-complete">
@@ -119,12 +119,12 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">添加时间：</label>
            <div class="layui-input-inline">
                <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">添加时间：</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->


        <hr class="layui-bg-gray">