Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-04-18 87df6a2ac0ac8dc46dde8b83853aebdf7efafe64

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

@@ -9,13 +9,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -26,6 +27,24 @@

    @Autowired
    private OrderDetlService orderDetlService;

    @Resource
    private OrderDetlMapper orderDetlMapper;

    @RequestMapping(value = "/orderDetl/search/pda/auth")
    @ManagerAuth
    public R pdaOrderDetlSearch(@RequestParam(required = false)String condition,@RequestParam(required = false) String order){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(condition)) {
//            wrapper.like("matnr", condition).or().like("maktx", condition);

            wrapper.like("matnr", condition);
        }
        wrapper.eq("order_no", order);
        wrapper.orderBy("create_time", false);
        List<OrderDetl> mats = orderDetlService.selectList(wrapper);
        return R.ok().add(mats);
    }

    @PostMapping("/orderDetl/list/pda/auth")
    public R getPdaOrderDetl(@RequestBody Map<String,Object> map) {
@@ -142,4 +161,13 @@
        return R.ok();
    }

    @RequestMapping(value = "/orderDetl/getPrintDetl/{id}")
    @ManagerAuth
    public R getPrintDetl(@PathVariable("id") Integer id) {
        if (Cools.isEmpty(id)) {
            return R.parse("id为空");
        }
        return R.ok(orderDetlService.selectById(id));
    }

}