#1

dubin

2026-01-12 4e46937e6311840fd3a146e77bca36908f2d914e

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

@@ -2,28 +2,26 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
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.*;
import com.zy.common.model.WrkDto;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.List;

/**
 * 移动端接口控制器
@@ -57,7 +55,15 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private MatService matService;
    @Autowired
    private CommonService commonService;
    @Autowired
    private WorkService workService;


    private static Logger logger = LogManager.getLogger(MobileController.class);

    // 商品上架
    @RequestMapping("/mat/onSale/auth")
@@ -136,10 +142,13 @@
                        combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setDetId(orderDetl.getDetId());
                        combMat.setDetlId(orderDetl.getId());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
                }
                combParam.setBillNo(order.getOrderNo());
                combParam.setOrderNo(order.getOrderNo());
                combParams.add(combParam);
            }
@@ -150,6 +159,7 @@
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam) {
        logger.info("组托参数：{}", combParam);
        if (Cools.isEmpty(combParam.getOrderNo())) {
            combParam.setOrderNo(combParam.getBillNo());
        }
@@ -162,6 +172,19 @@
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
    }

    @RequestMapping("/pickIn/auth")
//    @ManagerAuth(memo="盘点入库")
    public R pickIn(@RequestParam String barcode) {
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        List<PickInParam> param = wrkDetlService.selectDetByBarcode(barcode);
        for (PickInParam pickInParam : param) {
            pickInParam.setStaNo(wrkMast.getStaNo());
            pickInParam.setWorkNo(wrkMast.getWrkNo());
        }
        return R.ok().add(param);
    }


    @RequestMapping("/pack/get/auth")
    @ManagerAuth
@@ -429,7 +452,7 @@
        if (temp1 == null) {
            throw new CoolException("该订单不存在");
        }
        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).like("model", size).last("and anfme > work_qty"));
        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).last("and anfme > work_qty"));
        if (waitMatins == null || waitMatins.isEmpty()) {
            throw new CoolException("该订单项不存在");
        }
@@ -467,4 +490,31 @@
    }


    @RequestMapping("/combMeger/auth")
    @ManagerAuth(memo = "并板")
    public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam) {
        mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
        return R.ok("并板成功");
    }

    @RequestMapping("/empty/plate/out/start")
    @ManagerAuth(memo = "空板出库")
    public R emptyPlateOutStart(EmptyPlateOutParam param) {
        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("loc_type1", param.getType()).in("row1", 2, 3));
        if (locMasts == null || locMasts.isEmpty()) {
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("loc_type1", param.getType()).in("row1", 1, 4));
        }
        if (locMasts == null || locMasts.isEmpty()){
            return R.error("无空板库位");
        }
        param.setOutSite(1103);
        List<String> locNos = param.getLocNos();
        if (locNos == null){
            locNos = new ArrayList<>();
        }
        locNos.add(locMasts.get(0).getLocNo());
        param.setLocNos(locNos);
        workService.emptyPlateOut(param, getUserId());
        return R.ok("出库启动成功");
    }
}