diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiwmsPostDirectController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiwmsPostDirectController.java index 557b25c..47e8f0e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiwmsPostDirectController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/UdiwmsPostDirectController.java @@ -1,7 +1,6 @@ package com.glxp.sale.admin.controller.sync; import com.glxp.sale.admin.constant.BasicProcessStatus; -import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.sync.*; import com.glxp.sale.admin.http.PostSmpHttp; import com.glxp.sale.admin.req.sync.*; @@ -16,14 +15,12 @@ import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; 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 javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -182,5 +179,21 @@ public class UdiwmsPostDirectController { } + /** + * UDI管理系统同步单据上传状态到自助平台 + * + * @param postThirdSysUploadInfo + * @param bindingResult + * @return + */ + @PostMapping("/udisp/sync/postOrderUploadInfo") + public BaseResponse postOrderUploadInfo(@RequestBody PostThirdSysUploadInfo postThirdSysUploadInfo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + BaseResponse baseResponse = postSmpHttp.postOrderUploadInfo(postThirdSysUploadInfo); + return baseResponse; + } + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java b/api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java index 9a4c54a..ac6e8b1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/http/PostSmpHttp.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.http; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.sale.admin.req.sync.*; @@ -95,4 +96,25 @@ public class PostSmpHttp { return ResultVOUtils.error(500, "下载失败!"); } } + + /** + * 同步单据上传状态到自助平台 + * + * @param postThirdSysUploadInfo + * @return + */ + public BaseResponse postOrderUploadInfo(PostThirdSysUploadInfo postThirdSysUploadInfo) { + Map paramMap = new HashMap<>(3); + paramMap.put("orderId", postThirdSysUploadInfo.getOrderId()); + paramMap.put("wzUploadStatus", postThirdSysUploadInfo.getWzUploadStatus()); + paramMap.put("wzUploadResult", postThirdSysUploadInfo.getWzUploadResult()); + String response = UHttpClient.postJson(getSpmsUrl() + "/udiwms/", paramMap, getHeaders()); + try { + BaseResponse baseResponse = JSONUtil.toBean(response, BaseResponse.class); + return baseResponse; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "同步失败!"); + } + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThirdSysUploadInfo.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThirdSysUploadInfo.java new file mode 100644 index 0000000..19dc1bb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/PostThirdSysUploadInfo.java @@ -0,0 +1,26 @@ +package com.glxp.sale.admin.req.sync; + +import lombok.Data; + +/** + * 上传单据到第三方系统参数 + */ +@Data +public class PostThirdSysUploadInfo { + + /** + * 单据号 + */ + private String orderId; + + /** + * 上传到物资系统的状态 + */ + private Integer wzUploadStatus; + + /** + * 上传到物资系统的结果 + */ + private String wzUploadResult; + +}