|
|
|
@ -2,7 +2,6 @@ package com.logpm.factory.comfac.controller;
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
|
|
|
|
import com.logpm.basicdata.feign.IBasicdataCodeClient; |
|
|
|
|
import com.logpm.factory.comfac.dto.OrderInfoDTO; |
|
|
|
|
import com.logpm.factory.comfac.dto.OrderStatusDTO; |
|
|
|
|
import com.logpm.factory.comfac.dto.ReceiveInfoDTO; |
|
|
|
@ -14,7 +13,6 @@ import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.log4j.Log4j2; |
|
|
|
|
import org.springblade.common.constant.CodeNumConstant; |
|
|
|
|
import org.springblade.common.constant.RabbitConstant; |
|
|
|
|
import org.springblade.common.exception.CustomerException; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
@ -40,7 +38,6 @@ public class FactoryCommonController {
|
|
|
|
|
private final RabbitTemplate rabbitTemplate; |
|
|
|
|
private final IOrderStatusLogService orderStatusLogService; |
|
|
|
|
private final IFactoryCommonService factoryCommonService; |
|
|
|
|
private final IBasicdataCodeClient codeClient; |
|
|
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/sendOrders") |
|
|
|
@ -192,26 +189,4 @@ public class FactoryCommonController {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/testCode") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "卸车完成推送", notes = "传入receiveInfoDTO") |
|
|
|
|
public R testCode(@RequestBody OrderInfoDTO orderInfoDTO) { |
|
|
|
|
|
|
|
|
|
String lq = codeClient.getCodeByType(CodeNumConstant.WAYBILL, "LQ", orderInfoDTO.getOrderNo()); |
|
|
|
|
String lq1 = codeClient.getCodeByType(CodeNumConstant.PACKAGE, "LQ", orderInfoDTO.getOrderNo()); |
|
|
|
|
String lq2 = codeClient.getCodeByType(CodeNumConstant.TRAYS, "LQ", orderInfoDTO.getOrderNo()); |
|
|
|
|
String lq3 = codeClient.getCodeByType(CodeNumConstant.ABNORMAL_ORDER, "LQ", orderInfoDTO.getOrderNo()); |
|
|
|
|
|
|
|
|
|
log.info("##############testCode: code={}",lq); |
|
|
|
|
Map<String,String> map = new HashMap<>(); |
|
|
|
|
map.put("运单号",lq); |
|
|
|
|
map.put("包件码",lq1); |
|
|
|
|
map.put("托盘码",lq2); |
|
|
|
|
map.put("异常工单码",lq3); |
|
|
|
|
|
|
|
|
|
return R.data(map); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|