优化

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

@@ -30,6 +30,8 @@ public enum DictTypeEnum {
     THIRD_PARTY_YONGYOU_LOGIN("LOGIN", "登录接口"),
     THIRD_PARTY_YONGYOU_INVENTORYLIST("INVENTORYLIST", "存量接口"),
     THIRD_PARTY_YONGYOU_GETSTOCK("GETSTOCK", "存量库存接口"),
+    THIRD_PARTY_YONGYOU_GETSTOCK2("GETSTOCK2", "存量库存接口"),
+
     THIRD_PARTY_YONGYOU_ADDSPARE("ADDSPARE", "新增物料接口"),
     THIRD_PARTY_YONGYOU_PUSHPURCHASEORDER("PUSHPURCHASEORDER", "请购单"),
     THIRD_PARTY_YONGYOU_DELETEPURCHASEORDER("DELETEPURCHASEORDER", "删除请购单"),

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

@@ -115,6 +115,12 @@ public class YongyouController {
         return new R<>(yongyouService.selectPageList3(spareStoreDTO));
     }
 
+    @GetMapping("/spareStore/GetInventoryList/page")
+    public R<AbstractPageResultBean<SpareStoreVO>> GetInventoryList(SpareStoreDTO spareStoreDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R<>(yongyouService.selectPageList4(spareStoreDTO, pageNum, pageSize));
+    }
+
+
 
     /**
      * 同步请购单状态

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

@@ -51,6 +51,8 @@ public interface YongyouService {
      * @param pageSize
      * @return
      */
+    AbstractPageResultBean<SpareStoreVO> selectPageList4(SpareStoreDTO record, int pageNum, int pageSize);
+
     AbstractPageResultBean<SpareStoreVO> selectPageList(SpareStoreDTO record, int pageNum, int pageSize);
 
     AbstractPageResultBean<SpareStoreVO> selectPageList2(SpareStoreDTO record, int pageNum, int pageSize);

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

@@ -1345,6 +1345,89 @@ public class YongyouServiceImpl implements YongyouService {
         return myVOPage;
     }
 
+    @Override
+    public AbstractPageResultBean<SpareStoreVO> selectPageList4(SpareStoreDTO record, int pageNum, int pageSize) {
+        // 已生成情况，直接推送
+        GetCurrentStockHandler2 handler = new GetCurrentStockHandler2();
+        GetCurrentStockRequest req = new GetCurrentStockRequest();
+        req.setToken(geToken(record.getTokenType()));
+        req.setConn(getConn2(record.getTokenType()));
+        boolean isDev = BeanUtils.isDev();
+        if(!isDev){
+            if (record.getTokenType()==1){
+                req.setCAcc_ID("005");
+            }else if (record.getTokenType()==2){
+                req.setCAcc_ID("004");
+            }
+        }else{
+            req.setCAcc_ID("993");
+        }
+        req.setPageNum(pageNum);
+        req.setPageSize(pageSize);
+        StringBuffer whereStr = new StringBuffer(" 1=1 ");
+        // 仓库编码搜索
+        if (StringUtils.isNotBlank(record.getStoreNo())) {
+            whereStr.append(" and cWhCode like '%" + record.getStoreNo() + "%' ");
+        }
+        // 仓库名称搜索
+        if (StringUtils.isNotBlank(record.getStoreName())) {
+            whereStr.append(" and cWhName like '%" + record.getStoreName() + "%' ");
+        }
+        // 存货编码搜索
+        if (StringUtils.isNotBlank(record.getSpareNo())) {
+            whereStr.append(" and cInvCode like '%" + record.getSpareNo() + "%' ");
+        }
+        // 存货名称搜索
+        if (StringUtils.isNotBlank(record.getSpareName())) {
+            whereStr.append(" and cInvName like '%" + record.getSpareName() + "%' ");
+        }
+        // 规格型号搜索
+        if (StringUtils.isNotBlank(record.getGgxh())) {
+            whereStr.append(" and cInvStd like '%" + record.getGgxh() + "%' ");
+        }
+        if(record.getPurchaseFlag() == null || record.getPurchaseFlag() == 2){
+            // 非采购请求数据
+            whereStr.append(" and iQuantity > 0 ");
+        }
+        req.setStrWhere(whereStr.toString());
+        handler.setRequest(req);
+        String responseStr = handler.handler();
+        GetCurrentStockResponse response = JSONObject.parseObject(responseStr, GetCurrentStockResponse.class);
+        if (!response.getResult()) {
+            throw new BusinessException(response.getMsg());
+        }
+        GetCurrentStockResponseData data = response.getData();
+        List<GetCurrentStock> stocks = data.getStock();
+        List<SpareStoreVO> partInfoVOS = new ArrayList<>();
+        for (GetCurrentStock stockResponse : stocks) {
+            SpareStoreVO partInfoVO = new SpareStoreVO();
+            partInfoVO.setId(stockResponse.getAutoId() + "");
+            partInfoVO.setNo(stockResponse.getCInvCode());
+            partInfoVO.setSpareId(stockResponse.getPartId() + "");
+            partInfoVO.setSpareName(stockResponse.getCInvName());
+            partInfoVO.setGgxh(stockResponse.getCInvStd());
+            partInfoVO.setNum(stockResponse.getIQuantity());
+            partInfoVO.setStoreName(stockResponse.getCWhName());
+            partInfoVO.setStoreId(stockResponse.getCWhCode());
+            partInfoVO.setUnit(stockResponse.getCComUnitName());
+            partInfoVO.setCBatch(stockResponse.getCBatch());
+            partInfoVO.setAutoId(stockResponse.getAutoId());
+            partInfoVO.setStorePosition(stockResponse.getCInvDefine1());
+            partInfoVOS.add(partInfoVO);
+        }
+
+        //PageHelper.startPage(pageNum, pageSize);
+        MyVOPage<SpareStoreVO> myVOPage = new MyVOPage<>();
+        myVOPage.setPageNum(pageNum);
+        myVOPage.setPageSize(pageSize);
+        Page page = new Page(pageNum, pageSize);
+        page.setTotal(data.getTotal());
+        myVOPage.setPages(data.getPages().intValue());
+        myVOPage.setTotal(page.getTotal());
+        myVOPage.setRows(partInfoVOS);
+        return myVOPage;
+    }
+
     /**
      * 提交出库单到用友
      *

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

@@ -0,0 +1,39 @@
+package handler.yongyou;
+
+import com.platform.common.enums.DictTypeEnum;
+import com.platform.common.util.R;
+import handler.yongyou.request.BaseRequest;
+import handler.yongyou.request.FromYongYouBaseRequest;
+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;
+
+@Slf4j
+@Component
+public class GetCurrentStockHandler2 extends BaseRequestHandler{
+
+    public GetCurrentStockHandler2(){
+        setServiceType(DictTypeEnum.THIRD_PARTY_YONGYOU_GETSTOCK2.getType());
+    }
+
+
+
+
+    @Override
+    public R successHandler(FromYongYouBaseRequest req, String reqStr) {
+        return null;
+    }
+
+    /**
+     * 获取分页数据
+     * @param req
+     * @param resp
+     */
+    @Override
+    public void successResponse(BaseRequest req, BaseResponse resp) {
+        GetCurrentStockRequest request = (GetCurrentStockRequest)req;
+        GetCurrentStockResponse response = (GetCurrentStockResponse)resp;
+    }
+}