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 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 { /** * 上传到自助平台状态 - * + *

* 上传状态(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}) @@ -157,6 +157,8 @@ codeFillCheck=#{codeFillCheck}, preInBillNo=#{preInBillNo}, preOutBillNo=#{preOutBillNo}, + wzUploadStatus=#{wzUploadStatus}, + preOutBillNo=#{preOutBillNo}, WHERE id = #{id}