代码备份

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

@@ -1,11 +1,19 @@
 package com.glxp.api.controller.trace;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.purchase.SupCertRemindMsgEntity;
+import com.glxp.api.entity.sup.UserCertEntity;
+import com.glxp.api.entity.trace.TraceManuCodeRelEntity;
+import com.glxp.api.entity.trace.TraceManuOrderEntity;
 import com.glxp.api.req.trace.TraceManuDetailRequest;
 import com.glxp.api.req.trace.TraceManuOrderRequest;
+import com.glxp.api.req.trace.TraceManuOrderUploadRequest;
 import com.glxp.api.req.trace.TraceRecordRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceManuCodeRellResponse;
@@ -14,13 +22,24 @@ import com.glxp.api.res.trace.TraceRecordResponse;
 import com.glxp.api.service.trace.TraceManuCodeRelService;
 import com.glxp.api.service.trace.TraceManuOrderService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 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;
 
+
+/**
+ * 追溯查询-生产信息相关接口
+ */
+
 @ApiIgnore
 @RestController
 @Slf4j
@@ -55,4 +74,37 @@ public class TraceManuOrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
+    //客户端生产信息上传接口
+    @AuthRuleAnnotation("udi/trace/manu/order/upload")
+    @PostMapping("udi/trace/manu/order/upload")
+    public BaseResponse uploadManuOrder(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        TraceManuOrderEntity traceManuOrderEntity = new TraceManuOrderEntity();
+        BeanUtils.copyProperties(traceManuOrderUploadRequest, traceManuOrderEntity);
+        traceManuOrderEntity.setId(IdUtil.getSnowflakeNextId());
+        traceManuOrderEntity.setUpdateTime(new Date());
+
+        List<TraceManuDetailRequest> traceManuDetailRequests = traceManuOrderUploadRequest.getDetails();
+        if (CollUtil.isEmpty(traceManuDetailRequests)) {
+            return ResultVOUtils.error(500, "UDI码关联关系不能为空！");
+        }
+        List<TraceManuCodeRelEntity> traceManuCodeRelEntities = new ArrayList<>();
+        traceManuDetailRequests.stream().forEach(item -> {
+            TraceManuCodeRelEntity traceManuCodeRelEntity = new TraceManuCodeRelEntity();
+            BeanUtils.copyProperties(item, traceManuCodeRelEntity);
+            traceManuCodeRelEntity.setManuOrderIdFk(traceManuOrderEntity.getId());
+            traceManuCodeRelEntity.setManuOrderNo(traceManuOrderEntity.getRecordCode());
+            traceManuCodeRelEntity.setId(IdUtil.getSnowflakeNextId());
+            traceManuCodeRelEntities.add(traceManuCodeRelEntity);
+        });
+        traceManuOrderService.save(traceManuOrderEntity);
+        traceManuCodeRelService.saveOrUpdateBatch(traceManuCodeRelEntities);
+        return ResultVOUtils.success("成功");
+    }
+
+
 }

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

@@ -1,23 +1,29 @@
 package com.glxp.api.controller.trace;
 
+import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
-import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.trace.TraceOrderEntity;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
-import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.req.trace.TraceOrderUploadRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceOrderResponse;
-import com.glxp.api.res.trace.TraceRecordResponse;
 import com.glxp.api.service.trace.TraceOrderService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @ApiIgnore
@@ -38,4 +44,22 @@ public class TraceOrderController extends BaseController {
         pageSimpleResponse.setList(traceOrderResponses);
         return ResultVOUtils.success(pageSimpleResponse);
     }
+
+
+    //客户端出入库单据上传接口
+    @AuthRuleAnnotation("udi/trace/order/upload")
+    @PostMapping("udi/trace/order/upload")
+    public BaseResponse uploadOrder(@RequestBody TraceOrderUploadRequest traceOrderUploadRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        TraceOrderEntity traceOrderEntity = new TraceOrderEntity();
+        BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity);
+        traceOrderEntity.setId(IdUtil.getSnowflakeNextId());
+        traceOrderEntity.setUpdateTime(new Date());
+        traceOrderService.save(traceOrderEntity);
+        return ResultVOUtils.success("上传成功");
+    }
+
+
 }

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

@@ -10,4 +10,8 @@ import springfox.documentation.annotations.ApiIgnore;
 @RestController
 @Slf4j
 public class UdiTraceController extends BaseController {
+
+
+
+
 }

src/main/java/com/glxp/api/entity/trace/TraceManuCodeRelEntity.java

@@ -64,10 +64,16 @@ public class TraceManuCodeRelEntity implements Serializable {
     private Integer bzcj;
 
     /**
-     * 生产订单号外键
+     * 生产订单号
      */
-    @TableField(value = "manuOrderFk")
-    private Integer manuOrderFk;
+    @TableField(value = "manuOrderNo")
+    private String manuOrderNo;
+    /**
+     * 生产订单号ID外键
+     */
+    @TableField(value = "manuOrderIdFk")
+    private Long manuOrderIdFk;
+
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/trace/TraceManuOrderEntity.java

@@ -86,8 +86,8 @@ public class TraceManuOrderEntity implements Serializable {
     /**
      * 查询记录号外键
      */
-    @TableField(value = "recordCodeFk")
-    private String recordCodeFk;
+    @TableField(value = "recordCode")
+    private String recordCode;
 
 
     /**

src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java

@@ -83,7 +83,7 @@ public class TraceOrderEntity implements Serializable {
      * 客户端类型
      */
     @TableField(value = "clientType")
-    private Byte clientType;
+    private Integer clientType;
 
     /**
      * 退货原因（退货时填写）
@@ -141,8 +141,8 @@ public class TraceOrderEntity implements Serializable {
     /**
      * 查询记录号外键
      */
-    @TableField(value = "recordCodeFk")
-    private String recordCodeFk;
+    @TableField(value = "recordCode")
+    private String recordCode;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/glxp/api/req/trace/TraceManuDetailRequest.java

@@ -1,13 +1,11 @@
 package com.glxp.api.req.trace;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 @Data
 public class TraceManuDetailRequest extends ListPageRequest {
+
     private Long id;
 
     /**
@@ -54,5 +52,7 @@ public class TraceManuDetailRequest extends ListPageRequest {
      * 生产订单号外键
      */
     private String manuOrderNo;
+    private String manuOrderIdFk;
+
 
 }

src/main/java/com/glxp/api/req/trace/TraceManuOrderUploadRequest.java

@@ -0,0 +1,86 @@
+package com.glxp.api.req.trace;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class TraceManuOrderUploadRequest {
+
+
+    @NotNull(message = "追溯记录号")
+    private String recordCode;
+
+
+    /**
+     * 生产订单号
+     */
+    @NotNull(message = "生产订单号不能为空")
+    private String billNo;
+
+    /**
+     * 订单日期
+     */
+    @NotNull(message = "订单日期不能为空")
+    private String billDate;
+
+    /**
+     * 产品名称
+     */
+    @NotNull(message = "产品名称不能为空")
+    private String cpmctymc;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 产品描述
+     */
+    private String cpms;
+
+    /**
+     * 注册/备案证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * DI
+     */
+    @NotNull(message = "DI标识不能为空")
+    private String nameCode;
+
+    /**
+     * 国家库UUID
+     */
+    @NotNull(message = "国家库UUID不能为空")
+    private String uuid;
+
+    /**
+     * 医疗器械注册人
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
+
+    /**
+     * 企业信息ID外键
+     */
+    @NotNull(message = "企业信息ID不能为空")
+    private Long companyIdFk;
+
+    /**
+     * 上传者ID
+     */
+    @NotNull(message = "上传者ID不能为空")
+    private Long uploadUser;
+
+    @NotNull(message = "UDI码关联关系不能为空")
+    List<TraceManuDetailRequest> details;
+
+}

src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java

@@ -63,7 +63,7 @@ public class TraceOrderRequest extends ListPageRequest {
     /**
      * 客户端类型
      */
-    private Byte clientType;
+    private Integer clientType;
 
     /**
      * 退货原因（退货时填写）

src/main/java/com/glxp/api/req/trace/TraceOrderUploadRequest.java

@@ -0,0 +1,110 @@
+package com.glxp.api.req.trace;
+
+import lombok.Data;
+
+@Data
+public class TraceOrderUploadRequest {
+
+
+    /**
+     * 单据号
+     */
+    private String billNo;
+
+    /**
+     * 单据时间
+     */
+    private String billDate;
+
+    /**
+     * 1:入库；2：出库
+     */
+    private Byte inOutType;
+
+    /**
+     * 单据类型
+     */
+    private String billType;
+
+    /**
+     * 发货企业
+     */
+    private String fromCorp;
+
+    /**
+     * 发货企业统一社会信用号
+     */
+    private String fromCorpCreditNum;
+
+    /**
+     * 收货企业
+     */
+    private String toCorp;
+
+    /**
+     * 收货企业统一社会信用号
+     */
+    private String toCorpCreditNum;
+
+    /**
+     * 单据创建者
+     */
+    private Long createUser;
+
+    /**
+     * 企业信息ID外键
+     */
+    private Long companyIdFk;
+
+    /**
+     * 客户端类型
+     */
+    private Integer clientType;
+
+    /**
+     * 退货原因（退货时填写）
+     */
+    private String returnReason;
+
+    /**
+     * 销毁原因（销毁时填写）
+     */
+    private String destoryReason;
+
+    /**
+     * 执行销毁人（销毁时填写）
+     */
+    private String excuseUser;
+
+    /**
+     * 执行销毁人证件号（销毁时填写）
+     */
+    private String excuseCode;
+
+    /**
+     * 监督人姓名【销毁出库时填写】
+     */
+    private String superviserUser;
+
+    /**
+     * 监督人证件号【销毁出库时填写】
+     */
+    private String superviserCode;
+
+    /**
+     * 上传着ID
+     */
+    private Long uploadUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 查询记录号外键
+     */
+    private String recordCode;
+
+
+}

src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java

@@ -66,7 +66,7 @@ public class TraceOrderResponse {
     /**
      * 客户端类型
      */
-    private Byte clientType;
+    private Integer clientType;
 
     /**
      * 退货原因（退货时填写）

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

@@ -12,4 +12,8 @@ import java.util.List;
 public interface TraceManuOrderService extends IService<TraceManuOrderEntity> {
 
     List<TraceManuOrderResponse> filterTraces(TraceManuOrderRequest traceManuOrderRequest);
+
+
+
+
 }

src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml

@@ -9,7 +9,7 @@
         LEFT JOIN user_company uc ON uc.id = tor.companyIdFk
         LEFT JOIN (SELECT tr.recordCode,trd.*
         FROM trace_record tr
-        LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id) trmid ON trmid.recordCode = tor.recordCodeFk
+        LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id) trmid ON trmid.recordCode = tor.recordCode
         <where>
             <if test="udiCode != '' and udiCode != null">
                 and udiCode = #{udiCode}

src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml

@@ -3,11 +3,13 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceRecordMapper">
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceRecordRequest"
             resultType="com.glxp.api.res.trace.TraceRecordResponse">
-        SELECT tr.recordCode,tr.remark,trd.*,mid.*
+        SELECT tr.recordCode, tr.remark, trd.*, mid.*
         FROM trace_record tr
-        LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id
-        LEFT JOIN (SELECT tor.recordCodeFk,tor.fromCorp,tor.toCorp,tor.createUser,uc.companyName
-        FROM trace_order tor LEFT JOIN user_company uc ON uc.id = tor.companyIdFk) mid ON mid.recordCodeFk = tr.recordCode
+                     LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id
+                     LEFT JOIN (SELECT tor.billNo, tor.fromCorp, tor.toCorp, tor.createUser, uc.companyName
+                                FROM trace_order tor
+                                             LEFT JOIN user_company uc ON uc.id = tor.companyIdFk) mid
+                ON mid.billNo = tr.recordCode
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and recordCode = #{recordCode}

src/main/resources/schemas/schema_v2.1.sql

@@ -10,7 +10,7 @@ CALL Pro_Temp_ColumnWork('user_register', 'xemail', 'varchar(255)', 1);
 -- CALL Pro_Temp_ColumnWork('user_company', 'reason', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('user_register', 'fmobile', 'varchar(255)', 1);
 
-CALL Pro_Temp_ColumnWork('trace_order', 'recordCodeFk', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('trace_order', 'recordCode', 'varchar(255)', 1);