设备出库单与采购交互

platform-common/src/main/java/com/platform/common/enums/DictTypeEnum.java

@@ -38,6 +38,8 @@ public enum DictTypeEnum {
     THIRD_PARTY_YONGYOU_GETPURCHASEDETAILLIST("GETPURCHASEDETAILLIST", "请购单详情报表查询"),
     THIRD_PARTY_YONGYOU_GETPURCHASEPRICE("GETPURCHASEPRICE", "获取最新采购单价"),
     THIRD_PARTY_YONGYOU_GETPUSHPURCHASEORDERUPDATE("GETPUSHPURCHASEORDERUPDATE", "获取请购单修改信息"),
+    THIRD_PUSH_OUT_STORE_FORM("PUSH_OUT_STORE_FORM", "推送出库单到采购系统"),
+
 
 
 

platform-rest/src/main/java/com/platform/rest/controller/store/OutStoreFormController.java

@@ -46,6 +46,7 @@ public class OutStoreFormController {
         return new R<>(outStoreFormService.getDetail(id));
     }
 
+
     /**
      * 新增记录
      *

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongYouResponseUtil.java

@@ -1,6 +1,7 @@
 package com.platform.rest.controller.yongyou;
 
 import com.platform.common.util.JsonUtils;
+import handler.yongyou.response.ApplyOutStoreFormResponse;
 import handler.yongyou.response.ToYongYouBaseResponse;
 import lombok.extern.slf4j.Slf4j;
 
@@ -76,4 +77,19 @@ public class YongYouResponseUtil {
             log.error(e.toString());
         }
     }
+
+    public static void wirteBack2(ApplyOutStoreFormResponse resp, HttpServletResponse response){
+        try {
+            response.setContentType("application/json;charset=utf-8");
+            PrintWriter p = response.getWriter();
+            String respData = JsonUtils.objectToJson(resp);
+            log.info("同步响应明文："+resp);
+            p.print(respData);
+            p.flush();
+            p.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.toString());
+        }
+    }
 }

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -17,9 +17,13 @@ import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.yongyou.YongyouService;
+import handler.yongyou.ApplyOutStoreFormHandler;
 import handler.yongyou.PurchaseOrderModNoticeHandler;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.PurchaseOrderStatusModNoticeRequest;
+import handler.yongyou.request.UpdateOutStoreFormStatusRequest;
+import handler.yongyou.response.ApplyOutStoreFormResponse;
 import handler.yongyou.response.LongYanPurchaseDetailListVO;
 import handler.yongyou.response.ToYongYouBaseResponse;
 import lombok.AllArgsConstructor;
@@ -48,6 +52,8 @@ public class YongyouController {
     private final YongyouService yongyouService;
     @Resource
     private final PurchaseOrderModNoticeHandler purchaseOrderModNoticeHandler;
+    @Resource
+    private final ApplyOutStoreFormHandler applyOutStoreFormHandler;
 
     @PutMapping("/put")
     public R querySpare() {
@@ -74,6 +80,27 @@ public class YongyouController {
         return new R<>(yongyouService.selectPageList(sparePartInfoDTO, pageNum, pageSize));
     }
 
+    @PostMapping("/update/outStoreForm/status")
+    public void updateOutStoreFormStatus(HttpServletRequest request, HttpServletResponse response){
+        ToYongYouBaseResponse bs = null;
+        FromYongYouBaseRequest req = null;
+        try {
+            String reqStr = HttpUtil.getRequestParams(request);
+            if (StringUtils.isNotBlank(reqStr)) {
+                req = JsonUtils.jsonToModel(reqStr, UpdateOutStoreFormStatusRequest.class);
+                bs = purchaseOrderModNoticeHandler.propellingHandle(req, reqStr);
+            }
+        } catch (Exception e) {
+            bs.setResult(false);
+            bs.setMsg("系统错误！");
+            e.printStackTrace();
+            log.error("临沂理赔申请接口出错：" + e.getCause().getMessage());
+//            bs = LinYiResponseUtil.exceptionReturn(e.getMessage());
+        }
+        // 数据回传,这里的bs，默认做了加密处理
+        YongYouResponseUtil.wirteBack(bs, response);
+    }
+
     @PostMapping("/purchaseOrder/status/mod")
     public void PurchaseOrderNotice(HttpServletRequest request, HttpServletResponse response){
         ToYongYouBaseResponse bs = null;
@@ -95,6 +122,27 @@ public class YongyouController {
         YongYouResponseUtil.wirteBack(bs, response);
     }
 
+    @PostMapping("/apply/outStoreForm")
+    public void applyOutStoreForm(HttpServletRequest request, HttpServletResponse response){
+        ApplyOutStoreFormResponse bs = null;
+        FromPurchaseBaseRequest req = null;
+        try {
+            String reqStr = HttpUtil.getRequestParams(request);
+            if (StringUtils.isNotBlank(reqStr)) {
+//                req = JsonUtils.jsonToModel(reqStr, PurchaseOrderStatusModNoticeRequest.class);
+                bs = applyOutStoreFormHandler.propellingHandle2(req, reqStr);
+            }
+        } catch (Exception e) {
+            bs.setResult(false);
+            bs.setMsg("系统错误！");
+            e.printStackTrace();
+            log.error("临沂理赔申请接口出错：" + e.getCause().getMessage());
+//            bs = LinYiResponseUtil.exceptionReturn(e.getMessage());
+        }
+        // 数据回传,这里的bs，默认做了加密处理
+        YongYouResponseUtil.wirteBack2(bs, response);
+    }
+
 
     /**
      * 查询用友存量库存分页数据

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -10,16 +10,20 @@ import com.platform.common.util.*;
 import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
+import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.activiti.LocalAuditRecordMapper;
+import com.platform.dao.mapper.store.OutStoreDetailMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.SysUserVO;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
+import com.platform.dao.vo.query.store.OutStoreDetailVO;
+import com.platform.dao.vo.query.store.OutStoreFormVO;
 import com.platform.service.customize.BaseFormCheckServiceAbstract;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.upms.SysUserDeptService;
@@ -51,6 +55,7 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
     private final LocalAuditRecordMapper localAuditRecordMapper;
     private final SysUserMapper sysUserMapper;
     private final SysUserDeptService sysUserDeptService;
+    private final OutStoreDetailMapper outStoreDetailMapper;
 
     /**
      * 检查业务是否可以发起，比如检查业务状态等
@@ -213,6 +218,23 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
         outStoreForm.setUpdateUserId(SecurityUtils.getUserInfo().getUserId());
         outStoreForm.setUpdateUserName(SecurityUtils.getUserInfo().getRealName());
         outStoreFormMapper.updateByPrimaryKeySelective(outStoreForm);
+        try {
+            if (OutStoreStatusEnum.PUSH_OK.getValue() == outStoreForm.getStatus()) {
+                //推送用友成功，将出库单推送到采购系统
+                OutStoreFormVO vo = BeanConverterUtil.copyObjectProperties(outStoreFormMapper.selectByPrimaryKey(actAuditRequest.getId()), OutStoreFormVO.class);
+                OutStoreDetail detail = new OutStoreDetail();
+                detail.setOutId(vo.getId());
+                List<OutStoreDetail> outStoreDetails = outStoreDetailMapper.select(detail);
+                List<OutStoreDetailVO> outStoreDetailVOS = null;
+                if (outStoreDetails != null && outStoreDetails.size() > 0) {
+                    outStoreDetailVOS = BeanConverterUtil.copyListProperties(outStoreDetails, OutStoreDetailVO.class);
+                }
+                vo.setDetailList(outStoreDetailVOS);
+                yongyouService.pushOutStoreFormToPurchase(vo);
+            }
+        }catch (Exception e){
+
+        }
         return null;
     }
 

platform-service/src/main/java/com/platform/service/store/OutStoreFormService.java

@@ -19,6 +19,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface OutStoreFormService extends IBaseService<OutStoreForm, OutStoreFormDTO> {
+
     List<OutStoreFormVO> selectbyRepairForm(String id);
 
     List<OutStoreFormVO> selectLists(OutStoreFormDTO dto);

platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -7,6 +7,7 @@ import com.platform.dao.dto.spareAdd.InventoryTest;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
+import com.platform.dao.vo.query.store.OutStoreFormVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
 import com.platform.dao.vo.upms.PurchasePriceVO;
 import handler.yongyou.response.LongYanPurchaseDetailListVO;
@@ -22,6 +23,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface YongyouService {
+    void pushOutStoreFormToPurchase(OutStoreFormVO outStoreFormVO);
     String pushMergePurchaseOrder(String id);
     void purchaseOrderUpdate();
     AbstractPageResultBean<LongYanPurchaseDetailListVO> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize);

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -1116,6 +1116,15 @@ public class YongyouServiceImpl implements YongyouService {
 
     }
 
+    @Override
+    public void pushOutStoreFormToPurchase(OutStoreFormVO outStoreFormVO) {
+        PushOutStoreFormRequest request = new PushOutStoreFormRequest();
+        request.setOutStoreFormVO(outStoreFormVO);
+        PushOutStoreFormHandler handler = new PushOutStoreFormHandler();
+        handler.setRequest(request);
+        handler.handler();
+    }
+
     @Override
     public String pushMergePurchaseOrder(String id) {
         if (RedisUtils.get(id)!=null){

platform-service/src/main/java/handler/yongyou/AddSpareHandler.java

@@ -5,6 +5,7 @@ import com.platform.common.util.R;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +25,11 @@ public class AddSpareHandler extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/BaseRequestHandler.java

@@ -13,7 +13,9 @@ import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import com.platform.dao.entity.upms.ThirdInfoLog;
 import com.platform.service.upms.ThirdInfoLogService;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
+import handler.yongyou.response.ApplyOutStoreFormResponse;
 import handler.yongyou.response.BaseResponse;
 import handler.yongyou.response.ToYongYouBaseResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -82,8 +84,21 @@ public abstract class BaseRequestHandler {
         return respData;
     }
 
+    public ApplyOutStoreFormResponse propellingHandle2(FromPurchaseBaseRequest req, String reqStr){
+        ApplyOutStoreFormResponse respData = null;
+        //获取head
+
+        // 具体处理
+        R resp = successHandler2(req,reqStr);
+        respData = (ApplyOutStoreFormResponse) resp.getData();
+
+        return respData;
+    }
+
     public abstract R successHandler(FromYongYouBaseRequest req,String reqStr);
 
+    public abstract R successHandler2(FromPurchaseBaseRequest req,String reqStr);
+
 
     /**
      * 生成request log

platform-service/src/main/java/handler/yongyou/DeletePurchaseOrderHandler.java

@@ -6,6 +6,7 @@ import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.BaseRequestHandler;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,11 @@ public class DeletePurchaseOrderHandler extends BaseRequestHandler {
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/GetCurrentStockHandler.java

@@ -4,6 +4,7 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.GetCurrentStockRequest;
 import handler.yongyou.response.BaseResponse;
@@ -27,6 +28,11 @@ public class GetCurrentStockHandler extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/GetCurrentStockHandler2.java

@@ -3,6 +3,7 @@ package handler.yongyou;
 import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.GetCurrentStockRequest;
 import handler.yongyou.response.BaseResponse;
@@ -26,6 +27,11 @@ public class GetCurrentStockHandler2 extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/GetInventoryListHandler.java

@@ -4,6 +4,7 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.GetInventoryListRequest;
 import handler.yongyou.response.BaseResponse;
@@ -27,6 +28,11 @@ public class GetInventoryListHandler extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/GetPurchaseDetailListHandler.java

@@ -4,6 +4,7 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +24,11 @@ public class GetPurchaseDetailListHandler extends BaseRequestHandler {
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/GetPurchaseOrderUpdateHandler.java

@@ -4,6 +4,7 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,11 @@ public class GetPurchaseOrderUpdateHandler extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/GetPurchasePriceHandler.java

@@ -4,6 +4,7 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +26,11 @@ public class GetPurchasePriceHandler extends BaseRequestHandler {
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req

platform-service/src/main/java/handler/yongyou/LoginHandler.java

@@ -4,6 +4,7 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.LoginRequest;
 import handler.yongyou.response.BaseResponse;
@@ -27,6 +28,11 @@ public class LoginHandler extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 处理登录用友返回数据
      * 1:保存token，还是每次都调用token接口

platform-service/src/main/java/handler/yongyou/OtherOutHandler.java

@@ -4,6 +4,7 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.util.R;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.request.OtherOutAddRequest;
 import handler.yongyou.response.BaseResponse;
@@ -33,6 +34,11 @@ public class OtherOutHandler extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 处理出库，退库返回结果
      * 1:保存返回的出库入库单id

platform-service/src/main/java/handler/yongyou/PurchaseOrderModNoticeHandler.java

@@ -101,6 +101,11 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
         return r;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     private void addDetailStatus(PurchaseDetails data, LongYanPurchaseDetailDTO detail) {
         if ("已请购".equals(data.getStatus())){
             detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.applyed.getValue());

platform-service/src/main/java/handler/yongyou/PushPurchaseOrderHandler.java

@@ -5,6 +5,7 @@ import com.platform.common.util.R;
 import com.platform.dao.dto.upms.ThirdInfoLogDTO;
 import handler.yongyou.request.AddSpareRequest;
 import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromPurchaseBaseRequest;
 import handler.yongyou.request.FromYongYouBaseRequest;
 import handler.yongyou.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +27,11 @@ public class PushPurchaseOrderHandler extends BaseRequestHandler{
         return null;
     }
 
+    @Override
+    public R successHandler2(FromPurchaseBaseRequest req, String reqStr) {
+        return null;
+    }
+
     /**
      * 获取分页数据
      * @param req