#

lsh

2025-04-14 90bce5d1f5cdb5fb07d2ce6b216c7ff14cf74680

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

@@ -9,10 +9,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -23,8 +20,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.*;
import java.util.List;

/**
 * 移动端接口控制器
@@ -59,6 +56,71 @@
    @Autowired
    private WrkDetlLogService wrkDetlLogService;

    @Resource
    private StaDescService staDescService;

    @RequestMapping("/pda/WarehouseOut/v1")
    @ManagerAuth(memo = "并板途中拣料-参考念初")
    public R WarehouseOutV1(@RequestBody CombParam combParam) {
        return mobileService.WarehouseOutV1(combParam, getHostId(), getUserId());
    }

    @RequestMapping("/pda/WarehouseOutPickMerge/v1")
    @ManagerAuth(memo = "拣料途中并板")
    public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
        if (Cools.isEmpty(param,param.getLocNo(),param.getBarcode(),param.getCombMats())) {
            return R.parse("参数不能为空！");
        }
        return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
    }

    @RequestMapping("/pick/in")
    @ManagerAuth(memo = "并板入库")
    public R pickConfirm(@RequestBody PickConfirmParam param) {

        if(Cools.isEmpty(param,param.getList(),param.getLocNo(),param.getStaNo())) {
            return R.parse("参数不完整");
        }
        return mobileService.pickConfirm(param, getUserId());
    }

    @RequestMapping("/barcode/list/all")
    @ManagerAuth(memo = "并板入库途中拣料出库获取任务信息")
    public R orderOutListOrder(@RequestParam(required = false) String barcode) {
        return mobileService.orderOutListOrder(barcode, getUserId());
    }

    @RequestMapping("/barcode/list/pick")
    @ManagerAuth(memo = "拣料入库途中并板获取任务信息")
    public R orderOutListOrderPick(@RequestParam(required = false) String barcode) {
        return mobileService.orderOutListOrderPick(barcode, getUserId());
    }

    @RequestMapping("/loc/f/list")
    @ManagerAuth(memo = "获取在库库位")
    public R locNoF(@RequestParam(required = false) String locNo) {
        Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
                .eq("loc_sts", "F");
        if (!Cools.isEmpty(locNo)) {
            wrapper.like("loc_no", locNo);
        }
        List<LocMast> list = locMastService.selectList(wrapper);
        return R.ok().add(list);
    }

    @RequestMapping("/pick/sta/list")
    @ManagerAuth(memo = "获取并板站")
    public R pickSta() {
        List<StaDesc> list = staDescService.selectList(new EntityWrapper<StaDesc>()
                .eq("type_no", 104));
        return R.ok().add(list);
    }

    @RequestMapping("/pick/mat/list")
    @ManagerAuth(memo = "获取并板物料")
    public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) {
        return mobileService.pickMats(matnr, orderNo);
    }

    // 商品上架
    @RequestMapping("/mat/onSale/auth")
@@ -103,6 +165,54 @@
//        }
//        return R.ok().add(orderDetls);
//    }


//    @RequestMapping("/order/search/orderNo/auth")
//    @ManagerAuth
//    public R orderSearchByBarcode(@RequestParam String orderNo){
//        if (Cools.isEmpty(orderNo)){
//            orderNo=null;
//        }
////        List<Order> orders = orderService.selectorderNoL(orderNo);
//        List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
//        if (Cools.isEmpty(orders)){
//            return R.ok();
//        }
//        LinkedList<CombParam> combParams = new LinkedList<>();
//        if (!Cools.isEmpty(orders)){
//            for (Order order:orders){
//                CombParam combParam=new CombParam();
//                if (order == null) {
//                    continue;
//                }
//                DocType docType = docTypeService.selectById(order.getDocType());
//                if (docType.getPakin() == null || docType.getPakin() != 1) {
//                    continue;
//                }
//                if (order.getSettle() > 2) {
//                    continue;
//                }
////                List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
//                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
//                if (!Cools.isEmpty(orderDetls)) {
//                    LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
//                    for (OrderDetl orderDetl:orderDetls){
//                        CombParam.CombMat combMat = new CombParam.CombMat();
//                        combMat.setMatnr(orderDetl.getMatnr());
//                        combMat.setBatch(orderDetl.getBatch());
//                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
//                        combMat.setMaktx(orderDetl.getMaktx());
//                        combMat.setSpecs(orderDetl.getSpecs());
//                        combMats.add(combMat);
//                    }
//                    combParam.setCombMats(combMats);
//                }
//                combParam.setOrderNo(order.getOrderNo());
//                combParams.add(combParam);
//            }
//        }
//        return R.ok().add(combParams);
//    }
    @RequestMapping("/order/search/orderNo/auth")
    @ManagerAuth
    public R orderSearchByBarcode(@RequestParam String orderNo){
@@ -139,21 +249,33 @@
                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setBrand(orderDetl.getBrand());
                        combMat.setSku(orderDetl.getSku());
                        combMat.setMemo(orderDetl.getMemo());
                        combMat.setBoxType1(orderDetl.getBoxType1());
                        combMat.setBoxType2(orderDetl.getBoxType2());
                        combMat.setBoxType3(orderDetl.getBoxType3());
                        combMat.setStandby1(orderDetl.getStandby1());
                        combMat.setStandby2(orderDetl.getStandby2());
                        combMat.setStandby3(orderDetl.getStandby3());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
                }
                combParam.setOrderNo(order.getOrderNo());
                combParams.add(combParam);
                return R.ok().add(combParam);

//                combParams.add(combParam);
            }
        }
        return R.ok().add(combParams);
    }

    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
//    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, 9999L);
        return R.ok("组托成功");
    }