接口编写

zhang

2025-05-11 d6b6eb10d85af666ffe6fbdfe7aafbf3b538bf51

接口编写

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

@@ -4,11 +4,13 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.entity.param.PackParam;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -35,6 +37,8 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private WrkMastService wrkMastService;



@@ -93,36 +97,7 @@
        return R.ok().add(openService.pakinOrderComplete(param));
    }

    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/new/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //if (Cools.isEmpty(param.getLgort())) {
        //    return R.error("单据编号[lgort]不能为空");
        //}
        //if (!param.getLgort().equals("5006")) {
        //    return R.ok();
        //}
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
    }


    /**
     * 出库单回写
@@ -161,6 +136,68 @@
        }
    }









    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/new/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
    }


    /**
     * 添加出库单
     */
    @PostMapping("/pickToFill/barcode")
    @AppAuth(memo = "捡料转全板")
    public synchronized R againOut(@RequestHeader(required = false) String appkey,
                                            @RequestBody PackParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)||Cools.isEmpty(param.getBarcode())) {
            return R.error("托盘码为空,请检查");
        }
        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
        if (Cools.isEmpty(wrkMast)) {
            return R.error("无法通过托盘码找到该工作档,请检查托盘码是否正确");
        }
        if (wrkMast.getIoType() != 103) {
            return R.error("仅有捡料出库可以使用该功能");
        }
        if (wrkMast.getWrkSts() != 17) {
            return R.error("捡料出库未完成,请等待设备运行完成");
        }
        openService.pickToFill(wrkMast);
        return R.ok();
    }



    public static void main(String[] args) {
        // 1
        System.out.println("======================================");

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -1,5 +1,6 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
@@ -41,4 +42,5 @@
    // 打包上线
    void packageUp(PackParam param);

    void pickToFill(WrkMast wrkMast);
}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -51,6 +52,14 @@
    private TagService tagService;
    @Autowired
    private TagMapper tagMapper;

    @Autowired
    private WrkMastService wrkMastService;

    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private LocMastService locMastService;

    @Override
    @Transactional
@@ -271,6 +280,33 @@
            }
        }
    }
    @Override
    @Transactional
    public void pickToFill( WrkMast wrkMast ){
        Date now = new Date();
        wrkMast.setIoType(101);
        wrkMast.setMemo("捡料转全板工作档");
        wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
                .eq("wrk_no",wrkMast.getWrkNo()));
        wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
        for (LocDetl locDetl : locDetls) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setZpallet(wrkDetl.getBarcode());
            wrkDetl.setBarcode(wrkMast.getBarcode());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setAppeUser(1L);
            wrkDetl.setModiUser(1L);
            wrkDetl.setMatType(locDetl.getMatType());
            wrkDetlService.insert(wrkDetl);
        }
        locMastService.updateLocSts(wrkMast.getSourceLocNo(),"R");
    }


    @Override
    public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {