Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms...

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

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

@@ -21,7 +21,7 @@

  public void pdaLocNormalIn(List<LocNormal> list);

  public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse);
  public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse, String billNo);

  public void pdaLocNormalOut(List<LocNormal> list);