Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-09 aa21112291b04d0d3d53d75104a348f019f935a1

 src/main/java/com/zy/asrs/mapper/LocNormalMapper.java

@@ -24,11 +24,13 @@

    public void removeLocNormal(@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime, @Param("id") Integer id);

    public void locNormalIn(List<LocNormal> list);
    public Integer pdaLocNormalIn(List<LocNormal> list);

    public void pdaLocNormalIn(List<LocNormal> list);
    public Integer pdaLocNormalUpdate(List<LocNormal> list);

    public List<LocNormal> pdaLocNormalQuery(@Param("matnr") String matnr, @Param("warehouse") String warehouse);
    public Integer withoutSupplierLocNormalUpdate(List<LocNormal> list);

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

    public void pdaLocNormalOut1(@Param("id") Integer id,@Param("matnr") String matnr, @Param("modiUser") Long modiUser, @Param("modiTime") Date modiTime, @Param("warehouse") String warehouse);

@@ -37,4 +39,6 @@
    public List<LocNormal> pdaLocNormalWarehouseQuery(@Param("warehouse") String warehouse, @Param("matnr") String matnr);

    public void pdaLocNormalMove(List<LocNormal> list);

    public List<LocNormal> queryLocNorlMatnr(String matnr);
}