优化

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

@@ -32,6 +32,7 @@ public enum DictTypeEnum {
     THIRD_PARTY_YONGYOU_GETSTOCK("GETSTOCK", "存量库存接口"),
     THIRD_PARTY_YONGYOU_ADDSPARE("ADDSPARE", "新增物料接口"),
     THIRD_PARTY_YONGYOU_PUSHPURCHASEORDER("PUSHPURCHASEORDER", "请购单"),
+    THIRD_PARTY_YONGYOU_DELETEPURCHASEORDER("DELETEPURCHASEORDER", "删除请购单"),
 
     THIRD_PARTY_YONGYOU_OTHEROUT("OTHEROUT", "出库申请单"),
     REMOTE_MEASURE("REMOTE_MEASURE", "设备遥测"),

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

@@ -95,6 +95,12 @@ public class YongyouController {
         return new R(yongyouService.pushPurchaseOrder(id));
     }
 
+    @SysLog("请购单删除")
+    @GetMapping("/delete/purcahseOrder/{id}")
+    public R deletePurchaseOrder(@PathVariable String id) {
+        return new R<>(yongyouService.deletePurchaseOrder(id));
+    }
+
     /**
      * 用友回调领用出库单
      * 推送实际出库数量和状态

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

@@ -17,6 +17,8 @@ import handler.yongyou.response.OtherOutAddResponse;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface YongyouService {
+    String deletePurchaseOrder(String id);
+
     String pushSpare(String id);
     String pushPurchaseOrder(String id);
     String addSpare(InventoryTest inventory, Integer tokenType);

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

@@ -1,6 +1,5 @@
 package com.platform.service.yongyou.impl;
 
-import cn.hutool.core.lang.Dict;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.google.gson.JsonObject;
@@ -9,7 +8,6 @@ import com.platform.common.cache.DictCache;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
-import com.platform.dao.bean.MyPage;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
@@ -19,6 +17,7 @@ import com.platform.dao.dto.spareAdd.Inventory;
 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.entity.longyanpurchaseorder.LongYanPurchaseDetail;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbInfo;
@@ -26,10 +25,8 @@ import com.platform.dao.entity.sb.SbModelSpareBom;
 import com.platform.dao.entity.spareAdd.LongYanSpareAdd;
 import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.entity.store.OutStoreForm;
-import com.platform.dao.entity.store.SpareStore;
 import com.platform.dao.enums.LongYanSpareAddStatusEnum;
 import com.platform.dao.enums.OutStoreStatusEnum;
-import com.platform.dao.enums.SbInfoStatusEnum;
 import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
@@ -494,6 +491,37 @@ public class YongyouServiceImpl implements YongyouService {
         boms.add(sbModelSpareBom);
     }
 
+    @Override
+    public String deletePurchaseOrder(String id) {
+
+
+        LongYanPurchaseOrder order = new LongYanPurchaseOrder();
+        order.setYongYouId(id);
+        List<LongYanPurchaseOrder> list =  longYanPurchaseOrderMapper.select(order);
+        if (list==null || list.size()==0 ||list.size()>1){
+            throw new BusinessException("系统有误，请联系管理员！");
+        }
+
+        DeletePurchaseOrderRequest request = new DeletePurchaseOrderRequest();
+        request.setCcode(list.get(0).getYongYouId());
+        request.setTradeID("");
+        request.setToken(geToken(list.get(0).getOldOrNew()));
+        request.setCAcc_ID(getCAccId2(list.get(0).getOldOrNew()));
+        request.setConn(getConn2(list.get(0).getOldOrNew()));
+        DeletePurchaseOrderHandler handler = new DeletePurchaseOrderHandler();
+        handler.setRequest(request);
+        String responseStr = handler.handler();
+        DeletePurchaseOrderResponse response = JSONObject.parseObject(responseStr,DeletePurchaseOrderResponse.class);
+        if (response.getResult()){
+            longYanPurchaseOrderMapper.delete(list.get(0));
+            LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
+            detail.setLongYangPurchaseOrderId(list.get(0).getId());
+            longYanPurchaseDetailMapper.delete(detail);
+        }
+
+        return response.getMsg();
+    }
+
     @Override
     public String pushPurchaseOrder(String id) {
         LongYanPurchaseOrderDTO dto = new LongYanPurchaseOrderDTO();
@@ -565,6 +593,8 @@ public class YongyouServiceImpl implements YongyouService {
     }
 
 
+
+
     @Override
     public String pushSpare(String id) {
         LongYanSpareAdd add = longYanSpareAddMapper.selectByPrimaryKey(id);
@@ -626,7 +656,7 @@ public class YongyouServiceImpl implements YongyouService {
             Inventory.setCInvStd(inventoryTest.getCestInvStd());
             Inventory.setCInvCCode(inventoryTest.getCestInvCode());
 
-            Inventory.setCInvCode(IdGeneratorUtils.getObjectId());
+//            Inventory.setCInvCode(IdGeneratorUtils.getObjectId());
             Inventory.setCGroupCode("1");
             Inventory.setCCAComUnitCode(inventoryTest.getCestComUnitCode());
             Inventory.setCPlanMethod(inventoryTest.getCestPlanMethod());

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

@@ -0,0 +1,29 @@
+package handler.yongyou;
+
+import com.platform.common.enums.DictTypeEnum;
+import handler.yongyou.BaseRequestHandler;
+import handler.yongyou.request.AddSpareRequest;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.response.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class DeletePurchaseOrderHandler extends BaseRequestHandler {
+
+    public DeletePurchaseOrderHandler(){
+        setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_DELETEPURCHASEORDER.getType());
+    }
+
+    /**
+     * 获取分页数据
+     * @param req
+     * @param resp
+     */
+    @Override
+    public void successResponse(BaseRequest req, BaseResponse resp) {
+        AddSpareRequest request = (AddSpareRequest)req;
+//        AddSpareResponse response = (AddSpareResponse)resp;
+    }
+}

platform-service/src/main/java/handler/yongyou/request/DeletePurchaseOrderRequest.java

@@ -0,0 +1,12 @@
+package handler.yongyou.request;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class DeletePurchaseOrderRequest extends BaseRequest {
+    private String ccode;
+    @JSONField(name = "TradeID")
+    private String TradeID;
+
+}

platform-service/src/main/java/handler/yongyou/response/DeletePurchaseOrderResponse.java

@@ -0,0 +1,14 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class DeletePurchaseOrderResponse {
+    Boolean result;
+    String msg;
+    String data;
+
+}