#合并出库服务器错误问题修复

LSH

2022-10-31 23f3afa2a869a01e063875c9519dae7419e8a767

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -12,8 +12,9 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.dto.OrderDetlWithSum;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -41,6 +42,9 @@
    private MatService matService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Autowired
    private LocDetlService locDetlService;

    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
@@ -215,9 +219,10 @@
        if (mat == null) {
            return R.ok();
        }
        OrderDetl orderDetl = new OrderDetl();
        OrderDetlWithSum orderDetl = new OrderDetlWithSum();
        orderDetl.sync(mat);
        orderDetl.setAnfme(0.0D);
        orderDetl.setSum(locDetlService.selectSumByMatnr(mat.getMatnr()));
        return R.ok().add(orderDetl);
    }

@@ -305,7 +310,7 @@
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
                .andNew().like("matnr", condition).or().like("maktx", condition)
                .andNew().like("matnr", condition).or().like("maktx", condition).or().like("specs", condition)
                .orderBy("create_time", false);
        List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();