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

pjb

昨天 9ea93abc2606948e5724316a4a3ec338ea14a130

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
@@ -11,7 +12,9 @@

public interface PlaService extends IService<Pla> {

    Pla selectByBatchAndPackageNo(String batch, Integer packageNo);
    List<DropdownValuesDto> getDropdownValues();

    Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand);

    void queryStock(OrderDetl orderDetl, List<PlaQty> plaQties);