Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

whycq

2023-03-15 f0d2defd354a3d6fbaf77338f0c42fe133f019fd

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -52,6 +52,12 @@
    // 入库暂存数
    private Short inQty;

    // 隔壁站点（台车位置）
    private String nearbySta;

    // 托盘是可否整垛
    private boolean full;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);