浏览代码

存货大类

guarantee-lsq 1 年之前
父节点
当前提交
f9247c0b9c
共有 42 个文件被更改,包括 155 次插入151 次删除
  1. 0 13
      platform-common/src/main/java/com/platform/common/yongyou/request/AddSpareRequest.java
  2. 0 11
      platform-common/src/main/java/com/platform/common/yongyou/response/GetCurrentStockResponse.java
  3. 0 12
      platform-common/src/main/java/com/platform/common/yongyou/response/LoginResponse.java
  4. 0 12
      platform-common/src/main/java/com/platform/common/yongyou/response/OtherOutAddResponse.java
  5. 2 1
      platform-dao/src/main/java/com/platform/dao/dto/spareAdd/Inventory.java
  6. 22 0
      platform-dao/src/main/java/com/platform/dao/dto/spareAdd/InventoryTest.java
  7. 9 5
      platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java
  8. 1 1
      platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java
  9. 3 11
      platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java
  10. 4 3
      platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java
  11. 3 6
      platform-service/src/main/java/handler/yongyou/AddSpareHandler.java
  12. 2 2
      platform-service/src/main/java/handler/yongyou/BaseRequestHandler.java
  13. 5 9
      platform-service/src/main/java/handler/yongyou/GetCurrentStockHandler.java
  14. 4 6
      platform-service/src/main/java/handler/yongyou/GetInventoryListHandler.java
  15. 4 4
      platform-service/src/main/java/handler/yongyou/LoginHandler.java
  16. 4 6
      platform-service/src/main/java/handler/yongyou/OtherOutHandler.java
  17. 3 3
      platform-service/src/main/java/handler/yongyou/PushPurchaseOrderHandler.java
  18. 14 0
      platform-service/src/main/java/handler/yongyou/request/AddSpareRequest.java
  19. 1 3
      platform-service/src/main/java/handler/yongyou/request/BaseRequest.java
  20. 2 3
      platform-service/src/main/java/handler/yongyou/request/GetCurrentStockRequest.java
  21. 2 2
      platform-service/src/main/java/handler/yongyou/request/GetInventoryListRequest.java
  22. 2 2
      platform-service/src/main/java/handler/yongyou/request/LoginRequest.java
  23. 3 3
      platform-service/src/main/java/handler/yongyou/request/OtherOutAddRequest.java
  24. 1 1
      platform-service/src/main/java/handler/yongyou/request/OtherOutDetail.java
  25. 1 1
      platform-service/src/main/java/handler/yongyou/request/OtherOutMain.java
  26. 4 3
      platform-service/src/main/java/handler/yongyou/request/OtherOutVouch.java
  27. 1 1
      platform-service/src/main/java/handler/yongyou/request/PuAppDetail.java
  28. 1 1
      platform-service/src/main/java/handler/yongyou/request/PuAppMain.java
  29. 3 3
      platform-service/src/main/java/handler/yongyou/request/PuAppVouch.java
  30. 3 3
      platform-service/src/main/java/handler/yongyou/request/PushPurchaseOrderRequest.java
  31. 1 1
      platform-service/src/main/java/handler/yongyou/response/AddSpareResponse.java
  32. 1 1
      platform-service/src/main/java/handler/yongyou/response/BaseResponse.java
  33. 2 2
      platform-service/src/main/java/handler/yongyou/response/GetCurrentStock.java
  34. 11 0
      platform-service/src/main/java/handler/yongyou/response/GetCurrentStockResponse.java
  35. 2 2
      platform-service/src/main/java/handler/yongyou/response/GetCurrentStockResponseData.java
  36. 2 5
      platform-service/src/main/java/handler/yongyou/response/GetInventoryList.java
  37. 1 3
      platform-service/src/main/java/handler/yongyou/response/GetInventoryListResponse.java
  38. 5 3
      platform-service/src/main/java/handler/yongyou/response/GetInventoryListResponseData.java
  39. 2 2
      platform-service/src/main/java/handler/yongyou/response/Login.java
  40. 12 0
      platform-service/src/main/java/handler/yongyou/response/LoginResponse.java
  41. 11 0
      platform-service/src/main/java/handler/yongyou/response/OtherOutAddResponse.java
  42. 1 1
      platform-service/src/main/java/handler/yongyou/response/PushPurchaseOrderResponse.java

+ 0 - 13
platform-common/src/main/java/com/platform/common/yongyou/request/AddSpareRequest.java

@@ -1,13 +0,0 @@
-package com.platform.common.yongyou.request;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
-
-@Data
-public class AddSpareRequest extends BaseRequest{
-    @JSONField(name="Inventory")
-    private Inventory Inventory;
-    @JSONField(name="TradeID")
-    private String TradeID;
-
-}

+ 0 - 11
platform-common/src/main/java/com/platform/common/yongyou/response/GetCurrentStockResponse.java

@@ -1,11 +0,0 @@
-package com.platform.common.yongyou.response;
-
-import lombok.Data;
-
-/**
- * 现存量查询响应
- */
-@Data
-public class GetCurrentStockResponse extends BaseResponse{
-    GetCurrentStockResponseData data;
-}

+ 0 - 12
platform-common/src/main/java/com/platform/common/yongyou/response/LoginResponse.java

@@ -1,12 +0,0 @@
-package com.platform.common.yongyou.response;
-
-import lombok.Data;
-
-/**
- * 现存量查询响应
- */
-@Data
-public class LoginResponse extends BaseResponse{
-    private Login data;
-
-}

+ 0 - 12
platform-common/src/main/java/com/platform/common/yongyou/response/OtherOutAddResponse.java

@@ -1,12 +0,0 @@
-package com.platform.common.yongyou.response;
-
-import com.platform.common.yongyou.request.OtherOutVouch;
-import lombok.Data;
-
-/**
- * 现存量查询
- */
-@Data
-public class OtherOutAddResponse extends BaseResponse{
-    private String data;
-}

+ 2 - 1
platform-common/src/main/java/com/platform/common/yongyou/request/Inventory.java → platform-dao/src/main/java/com/platform/dao/dto/spareAdd/Inventory.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package com.platform.dao.dto.spareAdd;
 
 import lombok.Data;
 
@@ -47,6 +47,7 @@ public class Inventory implements Serializable {
     private boolean bFree1;//存货是否有自由项1,长度mm
     private boolean bFree2;//存货是否有自由项2 ,表面处理
     private boolean bFree3;//存货是否有自由项3 , 材质硬度
+    private Integer tokenType;
 
 
 

+ 22 - 0
platform-dao/src/main/java/com/platform/dao/dto/spareAdd/InventoryTest.java

@@ -0,0 +1,22 @@
+package com.platform.dao.dto.spareAdd;
+
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class InventoryTest extends BaseDTO implements Serializable {
+    private String cestInvCode;//存货分类编码
+    private String cestComUnitCode;//主计量单位编码
+    private String cestInvName;//存货名称
+    private String cestInvStd;//规格型号
+    private Integer tokenType;
+
+
+
+}

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

@@ -2,8 +2,10 @@ package com.platform.rest.controller.yongyou;
 
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.JsonUtils;
 import com.platform.common.util.R;
-import com.platform.common.yongyou.request.Inventory;
+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.vo.query.sparepartmanage.SparePartInfoVO;
@@ -12,6 +14,7 @@ import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.yongyou.YongyouService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -74,10 +77,11 @@ public class YongyouController {
     }
 
     @SysLog("新增物料发起")
-    @PostMapping("/add/spare/{tokenType}")
-    public R addSpare(@RequestBody Inventory inventory,@PathVariable Integer tokenType) {
-//        yongyouService.addOutForm(id, false);
-        return new R<>(yongyouService.addSpare(inventory,tokenType));
+    @PostMapping("/add/spare/tokenType")
+    public R addSpare(@RequestBody InventoryTest inventory) {
+        System.out.println("-------------------"+JsonUtils.objectToJson(inventory));
+        return new R();
+        //return new R<>(yongyouService.addSpare(inventory,1));
     }
 
     @SysLog("向用友推送采购单")

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

@@ -7,7 +7,6 @@ import com.platform.common.constant.CommonConstants;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
-import com.platform.common.yongyou.response.OtherOutAddResponse;
 import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.activiti.ActivitiUserModel;
 import com.platform.dao.entity.activiti.LocalAuditRecord;
@@ -26,6 +25,7 @@ import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.util.SendMessageUtils;
 import com.platform.service.yongyou.YongyouService;
+import handler.yongyou.response.OtherOutAddResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.task.Task;

+ 3 - 11
platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -2,20 +2,12 @@ package com.platform.service.yongyou;
 
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.yongyou.request.Inventory;
-import com.platform.common.yongyou.response.OtherOutAddResponse;
+import com.platform.dao.dto.spareAdd.Inventory;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
-import com.platform.dao.dto.store.SparePickFormDTO;
-import com.platform.dao.dto.store.SpareRestoreFormDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
-import com.platform.dao.entity.sqarepartmanage.SparePartInfo;
-import com.platform.dao.entity.store.SparePickForm;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
-import com.platform.dao.vo.query.store.SparePickFormVO;
 import com.platform.dao.vo.query.store.SpareStoreVO;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
+import handler.yongyou.response.OtherOutAddResponse;
 
 /**
  * @Description 用友service
@@ -25,7 +17,7 @@ import java.util.List;
  */
 public interface YongyouService {
     String pushPurchaseOrder(String id);
-    String addSpare(Inventory inventory,Integer tokenType);
+    String addSpare(Inventory inventory, Integer tokenType);
 
     /**
      * 分页查询备件列表

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

@@ -9,11 +9,10 @@ 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.common.yongyou.request.*;
-import com.platform.common.yongyou.response.*;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
+import com.platform.dao.dto.spareAdd.Inventory;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
 import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
@@ -41,6 +40,8 @@ import com.platform.service.store.OutStoreDetailService;
 import com.platform.service.store.OutStoreFormService;
 import com.platform.service.yongyou.YongyouService;
 import handler.yongyou.*;
+import handler.yongyou.request.*;
+import handler.yongyou.response.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -498,7 +499,7 @@ public class YongyouServiceImpl implements YongyouService {
     }
 
     @Override
-    public String addSpare(Inventory Inventory,Integer tokenType) {
+    public String addSpare(Inventory Inventory, Integer tokenType) {
         AddSpareRequest request = new AddSpareRequest();
         UserInfo userInfo = SecurityUtils.getUserInfo();
         Inventory.setDInvCreateDatetime(DateUtils.dateToString(LocalDateTime.now()));

+ 3 - 6
platform-service/src/main/java/handler/yongyou/AddSpareHandler.java

@@ -1,12 +1,9 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
-import com.platform.common.yongyou.request.AddSpareRequest;
-import com.platform.common.yongyou.request.BaseRequest;
-import com.platform.common.yongyou.request.GetCurrentStockRequest;
-import com.platform.common.yongyou.response.AddSpareResponse;
-import com.platform.common.yongyou.response.BaseResponse;
-import com.platform.common.yongyou.response.GetCurrentStockResponse;
+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;
 

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

@@ -9,11 +9,11 @@ import com.platform.common.util.BeanUtils;
 import com.platform.common.util.HttpUtil;
 import com.platform.common.util.JsonUtils;
 import com.platform.common.util.R;
-import com.platform.common.yongyou.request.BaseRequest;
-import com.platform.common.yongyou.response.BaseResponse;
 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.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;

+ 5 - 9
platform-service/src/main/java/handler/yongyou/GetCurrentStockHandler.java

@@ -1,17 +1,13 @@
 package handler.yongyou;
 
-import com.platform.common.constant.CommonConstants;
 import com.platform.common.enums.DictTypeEnum;
-import com.platform.common.util.DateUtils;
-import com.platform.common.yongyou.request.BaseRequest;
-import com.platform.common.yongyou.request.GetCurrentStockRequest;
-import com.platform.common.yongyou.response.BaseResponse;
-import com.platform.common.yongyou.response.GetCurrentStockResponse;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.GetCurrentStockRequest;
+import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.GetCurrentStockResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-
 @Slf4j
 @Component
 public class GetCurrentStockHandler extends BaseRequestHandler{
@@ -30,4 +26,4 @@ public class GetCurrentStockHandler extends BaseRequestHandler{
         GetCurrentStockRequest request = (GetCurrentStockRequest)req;
         GetCurrentStockResponse response = (GetCurrentStockResponse)resp;
     }
-}
+}

+ 4 - 6
platform-service/src/main/java/handler/yongyou/GetInventoryListHandler.java

@@ -1,12 +1,10 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
-import com.platform.common.yongyou.request.BaseRequest;
-import com.platform.common.yongyou.request.GetCurrentStockRequest;
-import com.platform.common.yongyou.request.GetInventoryListRequest;
-import com.platform.common.yongyou.response.BaseResponse;
-import com.platform.common.yongyou.response.GetCurrentStockResponse;
-import com.platform.common.yongyou.response.GetInventoryListResponse;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.GetInventoryListRequest;
+import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.GetInventoryListResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

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

@@ -1,10 +1,10 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
-import com.platform.common.yongyou.request.BaseRequest;
-import com.platform.common.yongyou.request.LoginRequest;
-import com.platform.common.yongyou.response.BaseResponse;
-import com.platform.common.yongyou.response.LoginResponse;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.LoginRequest;
+import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.LoginResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

+ 4 - 6
platform-service/src/main/java/handler/yongyou/OtherOutHandler.java

@@ -1,12 +1,10 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
-import com.platform.common.yongyou.request.BaseRequest;
-import com.platform.common.yongyou.request.LoginRequest;
-import com.platform.common.yongyou.request.OtherOutAddRequest;
-import com.platform.common.yongyou.response.BaseResponse;
-import com.platform.common.yongyou.response.LoginResponse;
-import com.platform.common.yongyou.response.OtherOutAddResponse;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.OtherOutAddRequest;
+import handler.yongyou.response.BaseResponse;
+import handler.yongyou.response.OtherOutAddResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

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

@@ -1,9 +1,9 @@
 package handler.yongyou;
 
 import com.platform.common.enums.DictTypeEnum;
-import com.platform.common.yongyou.request.AddSpareRequest;
-import com.platform.common.yongyou.request.BaseRequest;
-import com.platform.common.yongyou.response.BaseResponse;
+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;
 

+ 14 - 0
platform-service/src/main/java/handler/yongyou/request/AddSpareRequest.java

@@ -0,0 +1,14 @@
+package handler.yongyou.request;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.platform.dao.dto.spareAdd.Inventory;
+import lombok.Data;
+
+@Data
+public class AddSpareRequest extends BaseRequest {
+    @JSONField(name="Inventory")
+    private com.platform.dao.dto.spareAdd.Inventory Inventory;
+    @JSONField(name="TradeID")
+    private String TradeID;
+
+}

+ 1 - 3
platform-common/src/main/java/com/platform/common/yongyou/request/BaseRequest.java → platform-service/src/main/java/handler/yongyou/request/BaseRequest.java

@@ -1,8 +1,6 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.platform.common.cache.DictCache;
-import com.platform.common.enums.DictTypeEnum;
 import lombok.Data;
 
 import java.io.Serializable;

+ 2 - 3
platform-common/src/main/java/com/platform/common/yongyou/request/GetCurrentStockRequest.java → platform-service/src/main/java/handler/yongyou/request/GetCurrentStockRequest.java

@@ -1,13 +1,12 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 /**
  * 现存量查询
  */
 @Data
-public class GetCurrentStockRequest extends BaseRequest{
+public class GetCurrentStockRequest extends BaseRequest {
     private Integer pageSize;// 第几页
     private Integer pageNum;// 页数量
     private String strWhere;// 查询条件 cInvCode in('0341' ,'0301')

+ 2 - 2
platform-common/src/main/java/com/platform/common/yongyou/request/GetInventoryListRequest.java → platform-service/src/main/java/handler/yongyou/request/GetInventoryListRequest.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import lombok.Data;
 
@@ -6,7 +6,7 @@ import lombok.Data;
  * 现存量查询
  */
 @Data
-public class GetInventoryListRequest extends BaseRequest{
+public class GetInventoryListRequest extends BaseRequest {
     private Integer pageSize;// 第几页
     private Integer pageNum;// 页数量
     private String ccode;// 查询条件 cInvCode in('0341' ,'0301')

+ 2 - 2
platform-common/src/main/java/com/platform/common/yongyou/request/LoginRequest.java → platform-service/src/main/java/handler/yongyou/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
  * http://localhost:44333/api/v1.0/user/login
  */
 @Data
-public class LoginRequest extends BaseRequest{
+public class LoginRequest extends BaseRequest {
     @JSONField(name="CSrv")
     private String CSrv;
     @JSONField(name="PUserId")

+ 3 - 3
platform-common/src/main/java/com/platform/common/yongyou/request/OtherOutAddRequest.java → platform-service/src/main/java/handler/yongyou/request/OtherOutAddRequest.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
@@ -7,9 +7,9 @@ import lombok.Data;
  * 现存量查询
  */
 @Data
-public class OtherOutAddRequest extends BaseRequest{
+public class OtherOutAddRequest extends BaseRequest {
     @JSONField(name="OtherOutVouch")
-    private OtherOutVouch OtherOutVouch;// 查询条件 cInvCode in('0341' ,'0301')
+    private handler.yongyou.request.OtherOutVouch OtherOutVouch;// 查询条件 cInvCode in('0341' ,'0301')
     @JSONField(name="TradeID")
     private String TradeID;
 }

+ 1 - 1
platform-common/src/main/java/com/platform/common/yongyou/request/OtherOutDetail.java → platform-service/src/main/java/handler/yongyou/request/OtherOutDetail.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import lombok.Data;
 

+ 1 - 1
platform-common/src/main/java/com/platform/common/yongyou/request/OtherOutMain.java → platform-service/src/main/java/handler/yongyou/request/OtherOutMain.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import lombok.Data;
 

+ 4 - 3
platform-common/src/main/java/com/platform/common/yongyou/request/OtherOutVouch.java → platform-service/src/main/java/handler/yongyou/request/OtherOutVouch.java

@@ -1,13 +1,14 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.util.List;
+
 @Data
 public class OtherOutVouch {
     @JSONField(name="OtherOutMain")
-    private OtherOutMain OtherOutMain;
+    private handler.yongyou.request.OtherOutMain OtherOutMain;
     @JSONField(name="OtherOutDetail")
-    private List<OtherOutDetail> OtherOutDetail;
+    private List<handler.yongyou.request.OtherOutDetail> OtherOutDetail;
 }

+ 1 - 1
platform-common/src/main/java/com/platform/common/yongyou/request/PuAppDetail.java → platform-service/src/main/java/handler/yongyou/request/PuAppDetail.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import lombok.Data;
 

+ 1 - 1
platform-common/src/main/java/com/platform/common/yongyou/request/PuAppMain.java → platform-service/src/main/java/handler/yongyou/request/PuAppMain.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import lombok.Data;
 

+ 3 - 3
platform-common/src/main/java/com/platform/common/yongyou/request/PuAppVouch.java → platform-service/src/main/java/handler/yongyou/request/PuAppVouch.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.request;
+package handler.yongyou.request;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.util.List;
 @Data
 public class PuAppVouch{
     @JSONField(name="PuAppMain")
-    private PuAppMain PuAppMain;
+    private handler.yongyou.request.PuAppMain PuAppMain;
     @JSONField(name="PuAppDetail")
-    private List<PuAppDetail> PuAppDetail;
+    private List<handler.yongyou.request.PuAppDetail> PuAppDetail;
 }

+ 3 - 3
platform-common/src/main/java/com/platform/common/yongyou/request/PushPurchaseOrderRequest.java → platform-service/src/main/java/handler/yongyou/request/PushPurchaseOrderRequest.java

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

+ 1 - 1
platform-common/src/main/java/com/platform/common/yongyou/response/AddSpareResponse.java → platform-service/src/main/java/handler/yongyou/response/AddSpareResponse.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 

+ 1 - 1
platform-common/src/main/java/com/platform/common/yongyou/response/BaseResponse.java → platform-service/src/main/java/handler/yongyou/response/BaseResponse.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 

+ 2 - 2
platform-common/src/main/java/com/platform/common/yongyou/response/GetCurrentStock.java → platform-service/src/main/java/handler/yongyou/response/GetCurrentStock.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import java.time.LocalDate;
  * 现存量查询响应
  */
 @Data
-public class GetCurrentStock extends BaseResponse{
+public class GetCurrentStock extends BaseResponse {
     private Integer AutoId; ;// 仓库备件唯一id和sparestore id一样
     private Integer PartId; ;// ;//  partid 86
     private String cWhCode; ;// 仓库编码 "03"

+ 11 - 0
platform-service/src/main/java/handler/yongyou/response/GetCurrentStockResponse.java

@@ -0,0 +1,11 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class GetCurrentStockResponse extends BaseResponse {
+    GetCurrentStockResponseData data;
+}

+ 2 - 2
platform-common/src/main/java/com/platform/common/yongyou/response/GetCurrentStockResponseData.java → platform-service/src/main/java/handler/yongyou/response/GetCurrentStockResponseData.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.util.List;
  * 现存量查询响应
  */
 @Data
-public class GetCurrentStockResponseData extends BaseResponse{
+public class GetCurrentStockResponseData extends BaseResponse {
 
     Integer total;// 总数
     Double pages;// 总页数

+ 2 - 5
platform-common/src/main/java/com/platform/common/yongyou/response/GetInventoryList.java → platform-service/src/main/java/handler/yongyou/response/GetInventoryList.java

@@ -1,17 +1,14 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
 //
 
 /**
  * 现存量查询响应
  */
 @Data
-public class GetInventoryList extends BaseResponse{
+public class GetInventoryList extends BaseResponse {
     private String cInvCode; // 存货编码"01019002069"
     private String cInvName; // 存货名称"电源"
     private String cInvStd; // 规格型号 "亿泰鑫 2U/550W/冗余电源/550W-E-102"

+ 1 - 3
platform-common/src/main/java/com/platform/common/yongyou/response/GetInventoryListResponse.java → platform-service/src/main/java/handler/yongyou/response/GetInventoryListResponse.java

@@ -1,9 +1,7 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * 现存量查询响应
  */

+ 5 - 3
platform-common/src/main/java/com/platform/common/yongyou/response/GetInventoryListResponseData.java → platform-service/src/main/java/handler/yongyou/response/GetInventoryListResponseData.java

@@ -1,14 +1,16 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 
-;import java.util.List;//
+import java.util.List;
+
+;
 
 /**
  * 现存量查询响应
  */
 @Data
-public class GetInventoryListResponseData extends BaseResponse{
+public class GetInventoryListResponseData extends BaseResponse {
     Integer total;// 总数
     Double pages;// 总页数
     List<GetInventoryList> Inventory;

+ 2 - 2
platform-common/src/main/java/com/platform/common/yongyou/response/Login.java → platform-service/src/main/java/handler/yongyou/response/Login.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;
 
@@ -6,7 +6,7 @@ import lombok.Data;
  * 现存量查询响应
  */
 @Data
-public class Login extends BaseResponse{
+public class Login extends BaseResponse {
     private String cAcc_ID;
     private String Conn;
     private String Token;

+ 12 - 0
platform-service/src/main/java/handler/yongyou/response/LoginResponse.java

@@ -0,0 +1,12 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+/**
+ * 现存量查询响应
+ */
+@Data
+public class LoginResponse extends BaseResponse {
+    private Login data;
+
+}

+ 11 - 0
platform-service/src/main/java/handler/yongyou/response/OtherOutAddResponse.java

@@ -0,0 +1,11 @@
+package handler.yongyou.response;
+
+import lombok.Data;
+
+/**
+ * 现存量查询
+ */
+@Data
+public class OtherOutAddResponse extends BaseResponse {
+    private String data;
+}

+ 1 - 1
platform-common/src/main/java/com/platform/common/yongyou/response/PushPurchaseOrderResponse.java → platform-service/src/main/java/handler/yongyou/response/PushPurchaseOrderResponse.java

@@ -1,4 +1,4 @@
-package com.platform.common.yongyou.response;
+package handler.yongyou.response;
 
 import lombok.Data;