#

Junjie

2024-05-31 8e7fb1ba67eedeb4d1ab0899e0ae7bfc559adcf0

#

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

@@ -305,6 +305,13 @@
    @ExcelProperty(value = "备注")
    private String memo;

    /**
     * 旧商品编号
     */
    @ApiModelProperty(value= "旧商品编号")
    @ExcelProperty(value = "旧商品编码")
    private String matnr2;

    public Mat() {}

    public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {

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

@@ -112,6 +112,8 @@
    private NavigateMapUtils navigateMapUtils;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private MatService matService;


    /**
@@ -2998,7 +3000,14 @@
                                if (remainNum < 0) {
                                    remainNum = 0;
                                }
                                ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
                                String matnr = wrkDetl.getMatnr();
                                Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
                                if (mat != null) {
                                    if (!mat.getMatnr().equals(mat.getMatnr2())) {
                                        matnr += " - " + mat.getMatnr2();
                                    }
                                }
                                ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
                            });
                        }else {
                            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
@@ -3007,7 +3016,14 @@
                                if (remainNum < 0) {
                                    remainNum = 0;
                                }
                                ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
                                String matnr = wrkDetlLog.getMatnr();
                                Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
                                if (mat != null) {
                                    if (!mat.getMatnr().equals(mat.getMatnr2())) {
                                        matnr += " - " + mat.getMatnr2();
                                    }
                                }
                                ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
                            }
                        }


 src/main/resources/mapper/MatMapper.xml

@@ -44,6 +44,7 @@
        <result column="memo" property="memo" />

        <result column="stock" property="stock" />
        <result column="matnr2" property="matnr2" />
    </resultMap>

    <select id="selectByMatnr" resultMap="BaseResultMap">