lty
2025-05-18 ea8e354c77945964562edc61e04288b5a28dcb5c
#pda盘点入库开发
4个文件已修改
36 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/ConsoleController.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/model/SearchLocParam.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/model/protocol/StaProtocol.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -26,6 +26,7 @@
import com.zy.core.DevpThread;
import com.zy.core.RgvThread2;
import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
@@ -33,6 +34,7 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
@@ -92,6 +94,29 @@
        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
    }
    @PostMapping("/site/pickIn")
//    @ManagerAuth(memo = "盘点再入库")
    public R sitePickIn(@RequestParam Integer siteId, @RequestParam Integer workNo) throws InterruptedException {
        for (DevpSlave devp : slaveProperties.getDevp()) {
            for (DevpSlave.Sta inSta : devp.getPickSta()) {
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }
                staProtocol.setWorkNo(workNo);
                staProtocol.setSiteId(siteId);
                staProtocol.setStaNo((short) 999);
                if(MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol))){
                    return R.ok();
                }
            }
        }
        return R.error("入库失败,请检查站点以及工作档信息");
    }
    /****************************************************************/
    /************************** 实时数据 ******************************/
    /****************************************************************/
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -158,6 +158,11 @@
                    errMsg = "扫码失败";
                    back = true;
                }
//                if (!back && staProtocol.getWeight() == 0.0) {
//                    errMsg = "重量获取失败";
//                    back = true;
//                }
                // 退回
                if (back) {
@@ -245,6 +250,7 @@
                        param.setIoType(1);
                        param.setSourceStaNo(inSta.getStaNo());
                        param.setLocType1(locTypeDto.getLocType1());
                        param.setWeight(staProtocol.getWeight());
                        String response = new HttpHandler.Builder()
                                .setTimeout(30,TimeUnit.SECONDS)
                                .setUri(wmsUrl)
src/main/java/com/zy/common/model/SearchLocParam.java
@@ -18,6 +18,8 @@
    // 库位规格( 0:未知, 1:低库位, 2:中库位, 3:高库位 )
    private Short locType1;
    private Double weight;
    public static void main(String[] args) {
        SearchLocParam searchLocParam = new SearchLocParam();
        searchLocParam.setIoType(1);
src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -49,6 +49,9 @@
    // 锁定标记
    private boolean pakMk = true;
    //托盘重量
    private Double weight = 0.0;
    // 入库暂存数
    private Short inQty;