Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

12 小时以前 1367d13c3e57d1ea15fb172be0f2089e41601cc5

Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

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

@@ -32,7 +32,7 @@
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value= "")
    @TableId(value = "id", type = IdType.INPUT)
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**

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

@@ -1827,6 +1827,7 @@
                Mat mat = matService.selectByMatnr(combMat.getMatnr());
                BeanUtils.copyProperties(mat, basStationDetl);
                basStationDetl
                        .setId(null)
                        .setOrderNo(orderPakin.getOrderNo())
                        .setDevNo(basStation.getDevNo())
                        .setBarcode(params.getTarBarcode())