漏掉时间

api-admin/src/main/java/com/glxp/api/admin/controller/auth/ConnectTestController.java

@@ -1,17 +1,34 @@
 package com.glxp.api.admin.controller.auth;
 
+import com.glxp.api.admin.entity.auth.AuthConnectEntity;
+import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.req.auth.ConnectRequest;
+import com.glxp.api.admin.service.info.CompanyService;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 @RestController
 public class ConnectTestController {
 
+    @Resource
+    CompanyService companyService;
+
+
     @GetMapping("/udiwms/auth/device/connect")
     public BaseResponse index(ConnectRequest connequest) {
-        return ResultVOUtils.success("连接UDI管理系统成功！");
+
+
+        CompanyEntity companyEntity = companyService.findCompany();
+
+        AuthConnectEntity authConnectEntity = new AuthConnectEntity();
+        authConnectEntity.setCompanyName(companyEntity.getName());
+        authConnectEntity.setSysName("UDI管理系统");
+        return ResultVOUtils.success(companyEntity.getName());
+
     }
 
 

api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthConnectEntity.java

@@ -0,0 +1,9 @@
+package com.glxp.api.admin.entity.auth;
+
+import lombok.Data;
+
+@Data
+public class AuthConnectEntity {
+    private String companyName;
+    private String sysName;
+}

api-admin/src/main/java/com/glxp/api/admin/res/inout/OrderNoResult.java

@@ -7,7 +7,7 @@ import lombok.Data;
  */
 @Data
 public class OrderNoResult {
-
+    private String id;
     //补单单号
     private String supplementNo;
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -33,7 +33,7 @@
                              fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                              receiveStatus, erpFk, stockCheckFk, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                             outChangeEnable, originUllageSupNo, preCheck, thirdBillNo,updateTime)
+                             outChangeEnable, originUllageSupNo, preCheck, thirdBillNo, updateTime)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -53,7 +53,7 @@
                 #{stockCheckFk},
                 #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}
                    , #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo},
-                #{preCheck}, #{thirdBillNo},#{updateTime})
+                #{preCheck}, #{thirdBillNo}, #{updateTime})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@@ -92,7 +92,8 @@
         #{outChangeEnable},
         #{originUllageSupNo},
         #{preCheck},
-        #{thirdBillNo},#{updateTime}
+        #{thirdBillNo},
+        #{updateTime}
         )
     </insert>
 
@@ -569,14 +570,14 @@
         where id = #{id}
     </select>
 
-      <update id="updateReplicateNo">
+    <update id="updateReplicateNo">
         update io_order
         set replicateNo = #{replicateNo}
         where id = #{orderId}
     </update>
 
     <select id="selectOrderNos" resultType="com.glxp.api.admin.res.inout.OrderNoResult">
-        select supplementNo, originUllageSupNo, ullageSupNo, replicateNo
+        select id, supplementNo, originUllageSupNo, ullageSupNo, replicateNo
         from io_order
         where id = #{id}
     </select>