From 3d93d23683ba272fb86497d88f7a328245b85ecc Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 6 Dec 2022 14:23:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E8=A1=A8=EF=BC=8C=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=87=E8=AE=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/constant/ConstantStatus.java |  5 +++++
 .../controller/business/StockOrderController.java   |  1 -
 .../admin/entity/basic/BasicExportStatusEntity.java |  7 ++++++-
 .../glxp/api/admin/entity/inout/OrderEntity.java    | 13 ++++++++++++-
 .../resources/mybatis/mapper/inout/OrderDao.xml     |  6 ++++--
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java
index 9118e325..c9f0a428 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java
@@ -173,5 +173,10 @@ public class ConstantStatus {
     public static final int CERT_MANUFACTURER = 2; //生产企业
     public static final int CERT_PRODUCT = 3; //产品品种
 
+    //同步任务接收状态
+    public static final int SYNC_RECEIVE_STATUS_ERROR = -1; //接收失败
+    public static final int SYNC_RECEIVE_STATUS_WAIT = 0; //等待接收
+    public static final int SYNC_RECEIVE_STATUS_SUCCESS= 1; //接收成功
+
 
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java
index 3ea90f51..2597d8dc 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java
@@ -330,7 +330,6 @@ public class StockOrderController {
         //查询仓库名称
         orderService.queryInvName(resultList);
         resultList = orderService.checkSubmitOrder(resultList);
-        orderService.setUploadFlag(resultList);
         PageSimpleResponse<StockOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(resultList);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java
index 13a15210..d2531eee 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicExportStatusEntity.java
@@ -3,7 +3,6 @@ package com.glxp.api.admin.entity.basic;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 @Data
 public class BasicExportStatusEntity {
@@ -17,4 +16,10 @@ public class BasicExportStatusEntity {
     private Date startTime;
     private Date endTime;
     private String remark;
+
+    /**
+     * 接收状态 -1：接收失败 0：等待接收  1：接收成功
+     */
+    private Integer receiveStatus;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
index 17e4eb9f..c815d5ba 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
@@ -82,8 +82,19 @@ public class OrderEntity {
 
     /**
      * 上传到自助平台状态
-     *
+     * <p>
      * 上传状态（0：未上传，1：已上传）
      */
     private String uploadStatus;
+
+    /**
+     * 上传到医院物资系统状态
+     */
+    private Integer wzUploadStatus;
+
+    /**
+     * 上传到物资系统结果信息
+     */
+    private String wzUploadResult;
+
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index c4e840d3..46dcc57e 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -35,7 +35,7 @@
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
                              fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark,
-                             codeFillCheck, preInBillNo, preOutBillNo)
+                             codeFillCheck, preInBillNo, preOutBillNo, wzUploadResult, wzUploadResult)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -57,7 +57,7 @@
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
                 #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},
                 #{invStorageCode}, #{deptCode}, #{printRemark},
-                #{codeFillCheck}, #{preInBillNo}, #{preOutBillNo})
+                #{codeFillCheck}, #{preInBillNo}, #{preOutBillNo}, #{wzUploadStatus}, #{wzUploadResult})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@@ -157,6 +157,8 @@
             <if test="codeFillCheck != null">codeFillCheck=#{codeFillCheck},</if>
             <if test="preInBillNo != null">preInBillNo=#{preInBillNo},</if>
             <if test="preOutBillNo != null">preOutBillNo=#{preOutBillNo},</if>
+            <if test="wzUploadStatus != null">wzUploadStatus=#{wzUploadStatus},</if>
+            <if test="wzUploadResult != null">preOutBillNo=#{preOutBillNo},</if>
         </trim>
         WHERE id = #{id}
     </update>