优化

platform-dao/src/main/java/com/platform/dao/enums/LongYanPurchaseDetailStatusEnum.java

@@ -41,7 +41,7 @@ public enum LongYanPurchaseDetailStatusEnum {
     /**
      * 已入库
      */
-    check(6, "已入库"),
+    in_stored(6, "已入库"),
 
     close_apply_order(7, "请购关闭");
 

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

@@ -1,6 +1,8 @@
 package com.platform.rest.controller.yongyou;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonArray;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.util.HttpUtil;
 import com.platform.common.util.JsonUtils;
@@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @Description 备件领用登记单 控制器

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

@@ -25,10 +25,7 @@ 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.enums.LongYanPurchaseOrderStatusEnum;
-import com.platform.dao.enums.LongYanSpareAddStatusEnum;
-import com.platform.dao.enums.OutStoreStatusEnum;
-import com.platform.dao.enums.YesNoEnum;
+import com.platform.dao.enums.*;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseDetailMapper;
 import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
@@ -538,6 +535,21 @@ public class YongyouServiceImpl implements YongyouService {
                     detail.setYongYouId(vo.getCTrackNo());
                     detail.setPurchasedNum(vo.getIPOSum());
                     detail.setInStoreNum(vo.getIRDSum());
+                    if ("已请购".equals(data.get(0).getCAppState())){
+                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.applyed.getValue());
+                    }else if ("已询价".equals(data.get(0).getCAppState())){
+                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.asked_price.getValue());
+                    }else if ("采购中".equals(data.get(0).getCAppState())){
+                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchasing.getValue());
+                    }else if ("已采购".equals(data.get(0).getCAppState())){
+                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.purchased.getValue());
+                    }else if ("入库中".equals(data.get(0).getCAppState())){
+                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_storing.getValue());
+                    }else if ("已入库".equals(data.get(0).getCAppState())){
+                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.in_stored.getValue());
+                    }else if ("请购关闭".equals(data.get(0).getCAppState())){
+                        detail.setDetailStatus(LongYanPurchaseDetailStatusEnum.close_apply_order.getValue());
+                    }
                     list.add(detail);
                 }
                 if (list.size()>0){

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

@@ -20,7 +20,7 @@ public class AddSpareHandler extends BaseRequestHandler{
 
 
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req,String reqStr) {
         return null;
     }
 

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

@@ -76,13 +76,13 @@ public abstract class BaseRequestHandler {
         //获取head
 
             // 具体处理
-            R resp = successHandler(req);
+            R resp = successHandler(req,reqStr);
             respData = (ToYongYouBaseResponse) resp.getData();
 
         return respData;
     }
 
-    public abstract R successHandler(FromYongYouBaseRequest req);
+    public abstract R successHandler(FromYongYouBaseRequest req,String reqStr);
 
 
     /**

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

@@ -20,8 +20,10 @@ public class DeletePurchaseOrderHandler extends BaseRequestHandler {
     }
 
 
+
+
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
         return null;
     }
 

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

@@ -20,8 +20,10 @@ public class GetCurrentStockHandler extends BaseRequestHandler{
     }
 
 
+
+
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
         return null;
     }
 

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

@@ -20,8 +20,10 @@ public class GetInventoryListHandler extends BaseRequestHandler{
     }
 
 
+
+
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
         return null;
     }
 

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

@@ -19,7 +19,7 @@ public class GetPurchaseDetailListHandler extends BaseRequestHandler {
 
 
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
         return null;
     }
 

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

@@ -20,8 +20,10 @@ public class LoginHandler extends BaseRequestHandler{
     }
 
 
+
+
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
         return null;
     }
 

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

@@ -26,8 +26,10 @@ public class OtherOutHandler extends BaseRequestHandler{
     }
 
 
+
+
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
         return null;
     }
 

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

@@ -20,8 +20,9 @@ public class PushPurchaseOrderHandler extends BaseRequestHandler{
 
 
 
+
     @Override
-    public R successHandler(FromYongYouBaseRequest req) {
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
         return null;
     }
 

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

@@ -8,5 +8,7 @@ public class PurchaseDetails {
     Integer status;
     String spareNo;
     String remark;
+    Integer purchasedNum;
+    Integer inStoreNum;
 
 }