#

18516761980

2022-05-24 3185048d258d7a709af56333c83e641e46c6f989

#

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

@@ -4,8 +4,10 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,9 +20,8 @@

    @Autowired
    private WrkMastService wrkMastService;

    @Value("${store.bufferCount}")
    private int bufferCount;
    @Autowired
    private BasDevpService basDevpService;

    @Override
    public BasCrnp checkSiteStatus(Integer crnId) {
@@ -46,11 +47,56 @@
        }
        if (pakin) {
            //TODO控制入库暂存数，防止主干道堵塞，2022-5-24 ADD
            int storeCount = wrkMastService.getStoreCount(crnNo);
            int maxCount = bufferCount;
            if(crnNo==1){
                maxCount = 3;
            int staNo = 0;
            switch (crnNo){
                case 1:
                    staNo = 123;
                    break;
                case 2:
                    staNo = 121;
                    break;
                case 3:
                    staNo = 119;
                    break;
                case 4:
                    staNo = 117;
                    break;
                case 5:
                    staNo = 115;
                    break;
                case 6:
                    staNo = 113;
                    break;
                case 7:
                    staNo = 111;
                    break;
                case 8:
                    staNo = 109;
                    break;
                case 9:
                    staNo = 107;
                    break;
                case 10:
                    staNo = 105;
                    break;
                case 11:
                    staNo = 103;
                    break;
                case 12:
                    staNo = 101;
                    break;
            }
            int maxCount = 2;
            BasDevp devp = basDevpService.selectById(staNo);
            if(!Cools.isEmpty(devp)){
                maxCount = devp.getInQty();
            }

            int storeCount = wrkMastService.getStoreCount(crnNo);
//            int maxCount = bufferCount;
//            if(crnNo==1){
//                maxCount = 3;
//            }

            if(storeCount >= maxCount){
                log.error("{}号堆垛机暂存数已满!", crnNo);

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

@@ -79,7 +79,7 @@
            // ,{field: 'wrkNo1', align: 'center',title: ''}
            ,{field: 'locType1$', align: 'center',title: '高低'}
            ,{field: 'barcode', align: 'center',title: '条形码'}
            // ,{field: 'inQty', align: 'center',title: ''}
            ,{field: 'inQty', align: 'center',title: '入库暂存'}
            // ,{field: 'row1', align: 'center',title: ''}
            // ,{field: 'ioTime$', align: 'center',title: ''}
            // ,{field: 'area', align: 'center',title: ''}

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

@@ -132,8 +132,8 @@
                <input id="barcode" 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-inline"  style="width:31%;">
            <label class="layui-form-label">入库暂存：</label>
            <div class="layui-input-inline">
                <input id="inQty" class="layui-input" type="text">
            </div>