zy-asrs.git - Gitblit

parent: fee18a49 | 补丁 | 提交 | show whitespace

zhou zhou

昨天 ce34a29ce04ce600c8837cdc215a90500f24d323

#AGV

1个文件已添加

3个文件已修改

	src/main/java/com/zy/asrs/controller/OpenController.java	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/param/AgvTaskParam.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -1,21 +1,25 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
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.Task;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.TaskService;
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.List;
import java.util.*;

/**
 * Created by vincent on 2022/4/8
@@ -33,6 +37,58 @@
    @Autowired
    private OpenService openService;

    @Autowired
    private TaskService taskService;



    @PostMapping("/agvPickupComplete/agvCallback")
    @AppAuth(memo = "AGV取货完成接口")
    public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
        //        DecimalFormat df = new DecimalFormat("0000");
        //        String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
        String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
        Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
        if (Cools.isEmpty(task)) {
            log.error("未查询到任务号对应的数据");
        }
        task.setWrkSts(0L);
        taskService.updateById(task);

        HashMap<String, Object> map = new HashMap<>();
        map.put("code","0");
        map.put("message","成功");
        map.put("reqCode", "");
        log.info("agv请求取货完成，wms任务号:"+ JSON.toJSONString(agvTaskParam));
        return map;

    }

    @PostMapping("/agvTaskComplete/agvCallback")
    @AppAuth(memo = "AGV放货完成接口")
    public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
        HashMap<String, Object> map = new HashMap<>();
        String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
        Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
        if (Cools.isEmpty(task)) {
            log.error("未查询到任务号对应的数据");
        }

        taskService.updateById(task);
        if (task.getIoType() < 100 ){
            task.setWrkSts(4L);
        }else {
            task.setWrkSts(14L);
        }

        taskService.updateById(task);

        map.put("code","0");
        map.put("message","成功");
        map.put("reqCode", "");
        return map;
    }

    @PostMapping("/order/matSync/default/v2")
//    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,

 src/main/java/com/zy/asrs/entity/param/AgvTaskParam.java

New file
@@ -0,0 +1,14 @@
package com.zy.asrs.entity.param;

import lombok.Data;

@Data
public class AgvTaskParam {
    private String taskCode;
    private String ctnrCode;
    private String stgBinCode;




}

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

@@ -81,28 +81,28 @@
        }
        if (complete) {
            // 出库订单重新整理明细
            DocType docType = docTypeService.selectById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
                if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) {
                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                }
                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
                for (WrkDetl wrkDetl : wrkDetls) {
                    OrderDetlPakin orderDetl = new OrderDetlPakin();
                    orderDetl.sync(wrkDetl);
                    orderDetl.setQty(orderDetl.getAnfme());
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(orderNo);
                    orderDetl.setStatus(1);
                    orderDetl.setCreateTime(order.getCreateTime());
                    orderDetl.setCreateBy(order.getCreateBy());
                    orderDetl.setUpdateTime(order.getUpdateTime());
                    orderDetl.setUpdateBy(order.getUpdateBy());
                    if (!orderDetlService.insert(orderDetl)) {
                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                    }
                }
            }
//            DocType docType = docTypeService.selectById(order.getDocType());
//            if (null != docType && docType.getPakout() == 1) {
//                if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) {
//                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
//                }
//                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
//                for (WrkDetl wrkDetl : wrkDetls) {
//                    OrderDetlPakin orderDetl = new OrderDetlPakin();
//                    orderDetl.sync(wrkDetl);
//                    orderDetl.setQty(orderDetl.getAnfme());
//                    orderDetl.setOrderId(order.getId());
//                    orderDetl.setOrderNo(orderNo);
//                    orderDetl.setStatus(1);
//                    orderDetl.setCreateTime(order.getCreateTime());
//                    orderDetl.setCreateBy(order.getCreateBy());
//                    orderDetl.setUpdateTime(order.getUpdateTime());
//                    orderDetl.setUpdateBy(order.getUpdateBy());
//                    if (!orderDetlService.insert(orderDetl)) {
//                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
//                    }
//                }
//            }

            if (!this.updateSettle(order.getId(), 4L, null)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");

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

@@ -81,28 +81,28 @@
        }
        if (complete) {
            // 出库订单重新整理明细
            DocType docType = docTypeService.selectById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
                if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                }
                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
                for (WrkDetl wrkDetl : wrkDetls) {
                    OrderDetlPakout orderDetl = new OrderDetlPakout();
                    orderDetl.sync(wrkDetl);
                    orderDetl.setQty(orderDetl.getAnfme());
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(orderNo);
                    orderDetl.setStatus(1);
                    orderDetl.setCreateTime(order.getCreateTime());
                    orderDetl.setCreateBy(order.getCreateBy());
                    orderDetl.setUpdateTime(order.getUpdateTime());
                    orderDetl.setUpdateBy(order.getUpdateBy());
                    if (!orderDetlService.insert(orderDetl)) {
                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                    }
                }
            }
//            DocType docType = docTypeService.selectById(order.getDocType());
//            if (null != docType && docType.getPakout() == 1) {
//                if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
//                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
//                }
//                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
//                for (WrkDetl wrkDetl : wrkDetls) {
//                    OrderDetlPakout orderDetl = new OrderDetlPakout();
//                    orderDetl.sync(wrkDetl);
//                    orderDetl.setQty(orderDetl.getAnfme());
//                    orderDetl.setOrderId(order.getId());
//                    orderDetl.setOrderNo(orderNo);
//                    orderDetl.setStatus(1);
//                    orderDetl.setCreateTime(order.getCreateTime());
//                    orderDetl.setCreateBy(order.getCreateBy());
//                    orderDetl.setUpdateTime(order.getUpdateTime());
//                    orderDetl.setUpdateBy(order.getUpdateBy());
//                    if (!orderDetlService.insert(orderDetl)) {
//                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
//                    }
//                }
//            }

            if (!this.updateSettle(order.getId(), 4L, null)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");

			@@ -1,21 +1,25 @@
			package com.zy.asrs.controller;

			import com.alibaba.fastjson.JSON;
			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.Task;
			import com.zy.asrs.entity.WrkMast;
			import com.zy.asrs.entity.param.*;
			import com.zy.asrs.service.OpenService;
			import com.zy.asrs.service.TaskService;
			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.List;
			import java.util.*;

			/**
			* Created by vincent on 2022/4/8
			@@ -33,6 +37,58 @@
			@Autowired
			private OpenService openService;

			@Autowired
			private TaskService taskService;



			@PostMapping("/agvPickupComplete/agvCallback")
			@AppAuth(memo = "AGV取货完成接口")
			public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
			// DecimalFormat df = new DecimalFormat("0000");
			// String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
			String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
			Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
			if (Cools.isEmpty(task)) {
			log.error("未查询到任务号对应的数据");
			}
			task.setWrkSts(0L);
			taskService.updateById(task);

			HashMap<String, Object> map = new HashMap<>();
			map.put("code","0");
			map.put("message","成功");
			map.put("reqCode", "");
			log.info("agv请求取货完成，wms任务号:"+ JSON.toJSONString(agvTaskParam));
			return map;

			}

			@PostMapping("/agvTaskComplete/agvCallback")
			@AppAuth(memo = "AGV放货完成接口")
			public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
			HashMap<String, Object> map = new HashMap<>();
			String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
			Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
			if (Cools.isEmpty(task)) {
			log.error("未查询到任务号对应的数据");
			}

			taskService.updateById(task);
			if (task.getIoType() < 100 ){
			task.setWrkSts(4L);
			}else {
			task.setWrkSts(14L);
			}

			taskService.updateById(task);

			map.put("code","0");
			map.put("message","成功");
			map.put("reqCode", "");
			return map;
			}

			@PostMapping("/order/matSync/default/v2")
			// @AppAuth(memo = "商品信息同步接口")
			public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,

New file
			@@ -0,0 +1,14 @@
			package com.zy.asrs.entity.param;

			import lombok.Data;

			@Data
			public class AgvTaskParam {
			private String taskCode;
			private String ctnrCode;
			private String stgBinCode;




			}

			@@ -81,28 +81,28 @@
			}
			if (complete) {
			// 出库订单重新整理明细
			DocType docType = docTypeService.selectById(order.getDocType());
			if (null != docType && docType.getPakout() == 1) {
			if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) {
			throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
			}
			List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
			for (WrkDetl wrkDetl : wrkDetls) {
			OrderDetlPakin orderDetl = new OrderDetlPakin();
			orderDetl.sync(wrkDetl);
			orderDetl.setQty(orderDetl.getAnfme());
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(orderNo);
			orderDetl.setStatus(1);
			orderDetl.setCreateTime(order.getCreateTime());
			orderDetl.setCreateBy(order.getCreateBy());
			orderDetl.setUpdateTime(order.getUpdateTime());
			orderDetl.setUpdateBy(order.getUpdateBy());
			if (!orderDetlService.insert(orderDetl)) {
			throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
			}
			}
			}
			// DocType docType = docTypeService.selectById(order.getDocType());
			// if (null != docType && docType.getPakout() == 1) {
			// if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakin>().eq("order_id", order.getId()))) {
			// throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
			// }
			// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
			// for (WrkDetl wrkDetl : wrkDetls) {
			// OrderDetlPakin orderDetl = new OrderDetlPakin();
			// orderDetl.sync(wrkDetl);
			// orderDetl.setQty(orderDetl.getAnfme());
			// orderDetl.setOrderId(order.getId());
			// orderDetl.setOrderNo(orderNo);
			// orderDetl.setStatus(1);
			// orderDetl.setCreateTime(order.getCreateTime());
			// orderDetl.setCreateBy(order.getCreateBy());
			// orderDetl.setUpdateTime(order.getUpdateTime());
			// orderDetl.setUpdateBy(order.getUpdateBy());
			// if (!orderDetlService.insert(orderDetl)) {
			// throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
			// }
			// }
			// }

			if (!this.updateSettle(order.getId(), 4L, null)) {
			throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");