修正并板入库，批号不使用Mat中的

野心家

2024-12-18 1b4b84241538334b4475ba25f117decdc15e26ca

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

@@ -1,6 +1,7 @@
package com.zy.asrs.wms.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.common.domain.dto.LocDetlDto;
import com.zy.asrs.common.domain.dto.WrkDto;
import com.zy.asrs.common.domain.entity.MobileAdjustResult;
@@ -679,6 +680,9 @@
            wrkDetl.setHostId(getHostId());
            wrkDetl.setWrkMastId(wrkMast.getId());
            wrkDetl.setZpallet(wrkMast.getBarcode());
            if(Cools.isEmpty(matParam.getBatch())){
                wrkDetl.setBatch("");
            }
            if (!wrkDetlService.save(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }
@@ -834,6 +838,9 @@
        }
        for (OrderDetl o : orderDetls
        ) {
            if(o.getAnfme().equals(o.getQty())){
                continue;
            }
            for (LocDetl l : locDetls
            ) {
                if (o.getMatnr().equals(l.getMatnr())) {
@@ -850,4 +857,38 @@
        return R.ok(locDetlList);
    }

    @PostMapping("/pda/OutOrder")
    @ManagerAuth(memo = "获得出库单")
    @Transactional
    public R OutOrder(@RequestParam String orderNo) {
        List<Order> orders=new ArrayList<Order>();
        List<Order> OrderList=new ArrayList<Order>();
        if(Cools.isEmpty(orderNo)){
            orders= orderService.list(new LambdaQueryWrapper<Order>()
                    .between(Order::getSettle,1,2)
                    .eq(Order::getHostId, getHostId())
            );
        }else{
            orders= orderService.list(new LambdaQueryWrapper<Order>()
                    .like(Order::getOrderNo, orderNo)
                    .between(Order::getSettle,1,2)
                    .eq(Order::getHostId, getHostId())
            );
        }
        if(Cools.isEmpty(orders)){
            return R.ok();
        }
        for (Order o:orders
             ) {
            DocType docType=docTypeService.getOne(new LambdaQueryWrapper<DocType>()
                    .eq(DocType::getDocId,o.getDocType()));
            if(docType.getPakout()==1){
                OrderList.add(o);
            }
        }


        return R.ok(OrderList);
    }

}