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

zjj

2025-07-22 fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d

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

 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -30,7 +30,7 @@

    /**
     * 获取当天相同规格货物的深库位号
     * @param matnr 商品编号
     * @param matnr 商品编号同步新物料
     * @return locNo 库位号
     */
    List<String> getSameDetlToday(String matnr, Integer start, Integer end);

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

@@ -667,7 +667,7 @@
                    log.info("同步新物料[商品编号：{}]", mat.getMatnr());
                }
            } else {
                mat.sync(param);
                mat.sync(matParam);
                if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
                    throw new CoolException("更新已存在商品信息失败，请联系管理员");
                }