1.获取erp订单数据时过滤掉状态》5 2.同步erp删除数据时，只删除指定的订单明细 3.订单出库按批号排序

zwl

2025-11-21 1a2f494454d0da24bb9ca7ad7c0e91902819405a

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

@@ -1,18 +1,28 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.RobotTaskMessage;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;

/**
@@ -21,7 +31,7 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
public class OpenController {
public class OpenController extends BaseController {

    private static final boolean auth = true;
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -30,14 +40,122 @@

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

    /**
     * RGV任务反馈
     * 1:任务开始
     * 2：取到载具
     * 3：离开起点
     * 4：任务完成
     */
    @RequestMapping(value = "/api/robot/reporter/task")
    public HashMap<String, Object> RGVtask(@RequestBody RobotTaskMessage robotTaskMessage) {
        HashMap<String, Object> map = new HashMap<>();
        RobotTaskMessage.Extra extra = robotTaskMessage.getExtra();
        RobotTaskMessage.Values values = extra.getValues();
        int method =Integer.valueOf(values.getMethod());
        log.info("agv任务反馈AGV任务号={}任务状态为={}",robotTaskMessage.getRobotTaskCode(),method);
        if(method == 4){
            WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
                    .eq("supp", robotTaskMessage.getRobotTaskCode())
                    .eq("be_batch",2));
            if(!Cools.isEmpty(waitPakin)){
                /**
                 * agv状态
                 * be_batch
                 * 0：无需调用AGV
                 * 1：等待调用AGV
                 * 2：AGV任务下发成功
                 * 3：AGV任务完成
                 * 4：给输送线下发入库指令完成
                 */
                waitPakin.setBeBatch(3);
                waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("supp_code",waitPakin.getSuppCode()));
            }

            //拣料回库，agv搬运货物到输送线入库口--》修改inv_wh状态等待输送线入库--》wcs下发入库指令
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                    .in("wrk_sts", 34L)//34.下架完成等待回库
                    .eq("inv_wh","0")
                    .eq("pdc_type", robotTaskMessage.getRobotTaskCode()));//AGV出库搬运任务号
            if(!Cools.isEmpty(wrkMast)){
                /**
                 * inv_wh
                 * 拣料回库输送线出发
                 * 0等待agv放货完成
                 * 1等待输送线入库
                 * 2输送线入库任务下发成功
                 */
                wrkMast.setInvWh("1");
                wrkMast.setModiTime(new Date());
                wrkMastService.updateById(wrkMast);
            }

        }
        if(method == 3 || method == 4){
            /**
             * wrk_sts
             * 30.等待给AGV下发出库任务
             * 31.AGV出库任务下发成功
             * 32.AGV已搬离
             * 33.等待下架
             */
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                    .in("wrk_sts", 31L)//31.AGV出库任务下发成功
                    .eq("Pdc_type", robotTaskMessage.getRobotTaskCode()));//AGV出库搬运任务号
            if(!Cools.isEmpty(wrkMast)){
                wrkMast.setWrkSts(33L);//31.AGV出库任务下发成功---->32.AGV已搬离 32后移交给wcs系统，对站点信息进行清除
                wrkMast.setModiTime(new Date());
                wrkMastService.updateById(wrkMast);
            }
        }
        map.put("code", "SUCCESS");
        map.put("message", "成功");
        return map;
    }

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.syncMat(param);
        return R.ok();
    }

    /****************************************************************************/
    /********************************* 打包上线 **********************************/
    /****************************************************************************/

//    @PostMapping("/order/pakin/new/package/v1")
//    @AppAuth(memo = "打包上线接口")
//    public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
//                                            @RequestBody(required = false) PackParam param,
//                                            HttpServletRequest request) {
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        openService.packageUp(param);
//        return R.ok();
//    }

    /**
     * 添加入库单
     */
    @PostMapping("/order/pakin/new/default/v1")
    @PostMapping("/order/pakin/default/v1")
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param) {
        auth(appkey, param);
                                           @RequestBody OpenOrderPakinParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
@@ -58,24 +176,69 @@
     * 入库单回写
     */
    @PostMapping("/order/pakin/complete/default/v1")
    public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
                                        @RequestBody OpenOrderCompleteParam param) {
        auth(appkey, param);
    public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
                                             @RequestBody(required = false) OpenOrderCompleteParam param,
                                             HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakinOrderComplete(param));
    }

    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/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();
    }

    /**
     * 出库单回写
     */
    @PostMapping("/order/pakout/complete/default/v1")
    public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
                                              @RequestBody(required = false) OpenOrderCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakoutOrderComplete(param));
    }


    /**
     * 库存统计
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey) {
        auth(appkey, null);
    public R queryStock(@RequestHeader(required = false) String appkey,
                        HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
    }


    private void auth(String appkey, Object obj) {
        log.info("{}接口被访问！appkey:{},请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
        }
@@ -101,10 +264,12 @@
            switch (i) {
                case 0:
                    detlDto.setMatnr("MDH020030530");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(18.0);
                    break;
                case 1:
                    detlDto.setMatnr("MDH020016416");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(32.0);
                    break;
                case 2:
@@ -124,4 +289,7 @@
        System.out.println(JSON.toJSONString(param1));
    }

    /*********************************同步物料档案和订单****************************************************/


}