#

lsh

2024-10-26 9148737ad5137dd90a1061327aef121f8b3a66db

#

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

@@ -58,6 +58,10 @@
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private RgvOneSignService rgvOneSignService;
    @Autowired
    private OrderGiftService orderGiftService;
    @Autowired
    private OrderDetlGiftService orderDetlGiftService;


    // 商品上架
@@ -212,33 +216,28 @@
    }

    @RequestMapping("/wrkDetl/search/batch/auth")
    @ManagerAuth(memo = "出库确认获取信息")
    public R wrkDetlSearchByBatch(@RequestBody String batch){
        if (Cools.isEmpty(batch)){
            return R.error("参数为空");
        }
        String[] batch1 = batch.split("箱号：");
        String[] batch2 = batch1[1].split("规格：");
        batch = batch2[0].replaceAll(" ", "");
//        List<Order> orders = orderService.selectorderNoL(batch);
        WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
//        WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
        if (Cools.isEmpty(wrkDetl)){
            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
//            WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
            if (Cools.isEmpty(wrkDetlLog)){
                return R.error("未查到数据");
//    @ManagerAuth(memo = "出库确认获取信息")
    public R wrkDetlSearchByBatch(@RequestBody OrderGiftParam param){
        try{
            List<OrderDetlGift> orderDetlGifts = orderDetlGiftService.selectList(new EntityWrapper<OrderDetlGift>()
                    .eq("matnr", param.getSpecs())
                    .eq("batch", param.getBoxNo())
                    .eq("model", param.getRollNo())
                    .eq("price", param.getLength())
                    .eq("weight", param.getNetWeight())
                    .eq("volume", param.getGrossWeight())
                    .eq("specs", param.getSplices()));
            if (orderDetlGifts.isEmpty()){
                return R.error("查询信息异常，未匹配到明细").add(JSONObject.toJSONString(param));
            }
            wrkDetl = new WrkDetl();
            wrkDetl.sync(wrkDetlLog);
            wrkDetl.setBatch(wrkDetlLog.getBatch());
            wrkDetl.setBarcode(wrkDetlLog.getBarcode());
            wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
            if (orderDetlGifts.size()>1){
                return R.error("查询信息异常，存在多条明细").add(JSONObject.toJSONString(orderDetlGifts));
            }
        } catch (Exception e){
            return R.error("查询信息异常，未匹配到明细").add(JSONObject.toJSONString(param));
        }
        if (Cools.isEmpty(wrkDetl)){
            return R.error("未查到数据");
        }
        return R.ok().add(wrkDetl);

        return R.ok();
    }

    @RequestMapping("/order/search/batch/auth")

 src/main/java/com/zy/asrs/entity/param/OrderGiftParam.java

New file
@@ -0,0 +1,16 @@
package com.zy.asrs.entity.param;

import lombok.Data;

@Data
public class OrderGiftParam {

    private String rollNo;
    private String boxNo;
    private String specs;
    private Double length;
    private Double netWeight;
    private Double grossWeight;
    private String splices;

}