单据上传任务修改

src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java

@@ -9,12 +9,14 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.trace.TraceManuCodeRelEntity;
 import com.glxp.api.entity.trace.TraceManuOrderEntity;
+import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
 import com.glxp.api.req.trace.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceManuCodeRellResponse;
 import com.glxp.api.res.trace.TraceManuOrderResponse;
 import com.glxp.api.service.trace.TraceManuCodeRelService;
 import com.glxp.api.service.trace.TraceManuOrderService;
+import com.glxp.api.service.trace.TraceTaskNoticeService;
 import com.glxp.api.service.trace.TraceTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -71,6 +73,8 @@ public class TraceManuOrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @Resource
+    TraceTaskNoticeService traceTaskNoticeService;
 
     //客户端生产信息上传接口
     @AuthRuleAnnotation("udi/trace/manu/order/upload")
@@ -79,12 +83,13 @@ public class TraceManuOrderController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
+        TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceManuOrderUploadRequest.getTaskId());
         TraceManuOrderEntity traceManuOrderEntity = new TraceManuOrderEntity();
         BeanUtils.copyProperties(traceManuOrderUploadRequest, traceManuOrderEntity);
         traceManuOrderEntity.setId(IdUtil.getSnowflakeNextId());
         traceManuOrderEntity.setUpdateTime(new Date());
-
+        traceManuOrderEntity.setCompanyIdFk(taskNoticeEntity.getCompanyIdFk());
+        traceManuOrderEntity.setTraceProductIdFk(taskNoticeEntity.getProdudctRecordIdFk());
         List<TraceManuDetailRequest> traceManuDetailRequests = traceManuOrderUploadRequest.getDetails();
         if (CollUtil.isEmpty(traceManuDetailRequests)) {
             return ResultVOUtils.error(500, "UDI码关联关系不能为空！");
@@ -103,13 +108,4 @@ public class TraceManuOrderController {
         return ResultVOUtils.success("成功");
     }
 
-
-
-
-
-
-
-
-
-
 }

src/main/java/com/glxp/api/controller/trace/TraceOrderController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.trace;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -10,15 +11,17 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.sup.UserCompanyEntity;
+import com.glxp.api.entity.trace.TraceManuCodeRelEntity;
+import com.glxp.api.entity.trace.TraceManuOrderEntity;
 import com.glxp.api.entity.trace.TraceOrderEntity;
+import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
 import com.glxp.api.req.auth.FilterUserComapanyRequest;
-import com.glxp.api.req.trace.TraceOrderDetailRequest;
-import com.glxp.api.req.trace.TraceOrderUploadRequest;
-import com.glxp.api.req.trace.TraceProductRecordRequest;
+import com.glxp.api.req.trace.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceOrderResponse;
 import com.glxp.api.res.trace.TraceProductRecordResponse;
 import com.glxp.api.service.trace.TraceOrderService;
+import com.glxp.api.service.trace.TraceTaskNoticeService;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -30,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -68,8 +72,26 @@ public class TraceOrderController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @Resource
+    TraceTaskNoticeService traceTaskNoticeService;
 
+    //客户端单据信息上传接口
+    @AuthRuleAnnotation("udi/trace/inout/order/upload")
+    @PostMapping("udi/trace/inout/order/upload")
+    public BaseResponse uploadInoutOrder(@RequestBody TraceOrderUploadRequest traceOrderUploadRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
 
+        TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceOrderUploadRequest.getTaskId());
 
-
+        TraceOrderEntity traceOrderEntity = new TraceOrderEntity();
+        BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity);
+        traceOrderEntity.setCompanyIdFk(taskNoticeEntity.getCompanyIdFk());
+        traceOrderEntity.setTraceProductIdFk(taskNoticeEntity.getProdudctRecordIdFk());
+        traceOrderEntity.setId(IdUtil.getSnowflakeNextId());
+        traceOrderEntity.setUpdateTime(new Date());
+        traceOrderService.save(traceOrderEntity);
+        return ResultVOUtils.success("成功");
+    }
 }

src/main/java/com/glxp/api/service/trace/UdiTraceService.java

@@ -239,8 +239,8 @@ public class UdiTraceService {
         mqTraceMessage.setCompanyId(companyId);
         mqTraceMessage.setCerditNo(traceProductDetailEntity.getCreditNum());
         mqTraceMessage.setTaskId(traceProductDetailEntity.getId());
-//        rabbitPushService.send(mqTraceMessage);
-        rabbitPushService.publicPush(mqTraceMessage);
+        rabbitPushService.send(mqTraceMessage);
+//        rabbitPushService.publicPush(mqTraceMessage);
     }