diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index 430e63d..6be4f09 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -5,14 +5,20 @@ import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; +import com.glxp.sale.admin.req.thrsys.PostThirdSysUploadInfo; import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; import com.glxp.sale.admin.service.basic.BasicExportService; import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +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 javax.annotation.Resource; @@ -169,8 +175,21 @@ public class SpsSyncDownloadController { baseResponse.setData(spSyncUdiResponse); } return baseResponse; + } - + /** + * 同步UDI管理系统上传单据状态 + * + * @param postThirdSysUploadInfo + * @return + */ + @PostMapping("/sps/sync/order/syncOrderUploadInfo") + public BaseResponse syncOrderUploadInfo(@RequestBody PostThirdSysUploadInfo postThirdSysUploadInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return orderService.updateUploadInfo(postThirdSysUploadInfo); } + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index ce9f1eb..51a7efd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -25,7 +25,6 @@ import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BussinessTypResponse; @@ -255,6 +254,13 @@ public class OrderController { } else { orderEntityList = orderService.filterListOr(orderFilterRequest); } + + //处理上传第三方系统状态 + for (OrderEntity orderEntity : orderEntityList) { + if (null == orderEntity.getWzUploadStatus()) { + orderEntity.setWzUploadStatus("0"); + } + } PageInfo pageInfo; pageInfo = new PageInfo<>(orderEntityList);//TODO 已完成单据列表 PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java index 425206c..ec3a8ea 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java @@ -90,4 +90,11 @@ public interface OrderDao { * @return */ OrderNoResult selectOrderNos(String id); + + /** + * 更新单据上传信息 + * + * @param orderEntity + */ + void updateOrderUploadInfo(OrderEntity orderEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index 387db8d..7f89636 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java @@ -76,7 +76,14 @@ public class OrderEntity { private String preInBillNo; private String preOutBillNo; + /** + * 上传到医院物资系统状态 + */ private String wzUploadStatus; + + /** + * 上传到物资系统结果信息 + */ private String wzUploadResult; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThirdSysUploadInfo.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThirdSysUploadInfo.java new file mode 100644 index 0000000..2977247 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThirdSysUploadInfo.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.req.thrsys; + +import lombok.Data; + +/** + * 上传单据到第三方系统参数 + */ +@Data +public class PostThirdSysUploadInfo { + + /** + * 单据号 + */ + private String orderId; + + /** + * 上传到物资系统的状态 + */ + private Integer wzUploadStatus; + + /** + * 上传到物资系统的结果 + */ + private String wzUploadResult; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java index c95a5f7..f542e65 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java @@ -5,6 +5,7 @@ import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.req.inout.OrderQueryRequest; +import com.glxp.sale.admin.req.thrsys.PostThirdSysUploadInfo; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.common.res.BaseResponse; @@ -124,4 +125,11 @@ public interface OrderService { */ void queryInvName(List responseList); + /** + * 同步UDI管理系统的单据上传状态 + * + * @param postThirdSysUploadInfo + * @return + */ + BaseResponse updateUploadInfo(PostThirdSysUploadInfo postThirdSysUploadInfo); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index bfec895..d7bb1c0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -24,6 +24,7 @@ import com.glxp.sale.admin.req.inout.OrderQueryRequest; import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductRequest; +import com.glxp.sale.admin.req.thrsys.PostThirdSysUploadInfo; import com.glxp.sale.admin.res.inout.OrderNoResult; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.service.inout.OrderService; @@ -494,6 +495,21 @@ public class OrderServiceImpl implements OrderService { } } + @Override + public BaseResponse updateUploadInfo(PostThirdSysUploadInfo postThirdSysUploadInfo) { + if (null == postThirdSysUploadInfo || StrUtil.isBlank(postThirdSysUploadInfo.getOrderId())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数为空,同步失败!"); + } + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(postThirdSysUploadInfo.getOrderId()); + OrderEntity orderEntity = orderDao.findOne(orderFilterRequest); + if (null == orderEntity) { + return ResultVOUtils.error(500, "此单据不存在!"); + } + orderDao.updateOrderUploadInfo(orderEntity); + return ResultVOUtils.success("同步完成!"); + } + @Transactional(rollbackFor = Exception.class) @Override public void deleteOrders(List ids) { 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 0b5d4e3..7758127 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -660,4 +660,12 @@ where id = #{id} + + update io_order + + wzUploadStatus=#{wzUploadStatus}, + wzUploadResult=#{wzUploadResult}, + + where id = #{id} + \ No newline at end of file