UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

诊断获取单据相关修改

Browse Source
dev
anthonywj 2 years ago
parent 6627cfd3c2
commit 643bf4e6dd
4 changed files with 72 additions and 57 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.mipsdl.client.ptxhyy.entity;
import com.glxp.mipsdl.dao.ptxyy.ThrHslbMapper;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

123
src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java
Unescape Escape View File

@ -170,30 +170,35 @@ public class PzhzdClient implements BaseHttpClient {
// uPurchaseinRequest.setFbillflag("3");
// }
uPurchaseinRequest.setBillcode(udiwmsOrderQueryRequest.getBillNo());
List<UdiwmsOrderResponse> udiwmsOrderResponses = getPurchasein(uPurchaseinRequest);
if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) {
List<UdiwmsOrderResponse> returnsList = new ArrayList<>();
if ("采购入库".equals(udiwmsOrderQueryRequest.getBillAction())) {
for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
if (udiwmsOrderResponses.get(i).getBillType().equals("采购入库")) {
returnsList.add(udiwmsOrderResponses.get(i));
}
}
} else if ("退货出库".equals(udiwmsOrderQueryRequest.getBillAction())) {
for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
if (udiwmsOrderResponses.get(i).getBillType().equals("退货出库")) {
returnsList.add(udiwmsOrderResponses.get(i));
}
}
} else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) {
returnsList.addAll(udiwmsOrderResponses);
}
PageSimpleResponse<UdiwmsOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal((long) returnsList.size());
pageSimpleResponse.setList(returnsList);
return ResultVOUtils.success(pageSimpleResponse);
} else
return ResultVOUtils.error(500, "未查询到数据");
BaseResponse<PageSimpleResponse<UdiwmsOrderResponse>> baseResponse = getPurchasein(uPurchaseinRequest);
// if (baseResponse.getCode() != 20000) {
//
// }
return baseResponse;
// List<UdiwmsOrderResponse> udiwmsOrderResponses = baseResponse.getData().getList();
// if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) {
// List<UdiwmsOrderResponse> returnsList = new ArrayList<>();
// if ("采购入库".equals(udiwmsOrderQueryRequest.getBillAction())) {
// for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
// if (udiwmsOrderResponses.get(i).getBillType().equals("采购入库")) {
// returnsList.add(udiwmsOrderResponses.get(i));
// }
// }
// } else if ("退货出库".equals(udiwmsOrderQueryRequest.getBillAction())) {
// for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
// if (udiwmsOrderResponses.get(i).getBillType().equals("退货出库")) {
// returnsList.add(udiwmsOrderResponses.get(i));
// }
// }
// } else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) {
// returnsList.addAll(udiwmsOrderResponses);
// }
// PageSimpleResponse<UdiwmsOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal((long) returnsList.size());
// pageSimpleResponse.setList(returnsList);
// return ResultVOUtils.success(pageSimpleResponse);
// } else
// return ResultVOUtils.error(500, "未查询到数据");
} else if (
"WareHouseOut".equals(udiwmsOrderQueryRequest.getAction()) ||
@ -212,31 +217,32 @@ public class PzhzdClient implements BaseHttpClient {
uSaleoutQueryRequest.setFbillflag("3");
}
uSaleoutQueryRequest.setBillcode(udiwmsOrderQueryRequest.getBillNo());
List<UdiwmsOrderResponse> udiwmsOrderResponses = getSaleout(uSaleoutQueryRequest);
if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) {
List<UdiwmsOrderResponse> returnsList = new ArrayList<>();
if ("销售出库".equals(udiwmsOrderQueryRequest.getBillAction())) {
for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
if (udiwmsOrderResponses.get(i).getBillType().equals("销售出库")) {
returnsList.add(udiwmsOrderResponses.get(i));
}
}
} else if ("退货入库".equals(udiwmsOrderQueryRequest.getBillAction())) {
for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
if (udiwmsOrderResponses.get(i).getBillType().equals("退货入库")) {
returnsList.add(udiwmsOrderResponses.get(i));
}
}
} else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) {
returnsList.addAll(udiwmsOrderResponses);
}
PageSimpleResponse<UdiwmsOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal((long) returnsList.size());
pageSimpleResponse.setList(returnsList);
return ResultVOUtils.success(pageSimpleResponse);
} else
return ResultVOUtils.error(500, "未查询到数据");
BaseResponse<PageSimpleResponse<UdiwmsOrderResponse>> baseResponse = getSaleout(uSaleoutQueryRequest);
return baseResponse;
// List<UdiwmsOrderResponse> udiwmsOrderResponses = baseResponse.getData().getList();
// if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) {
// List<UdiwmsOrderResponse> returnsList = new ArrayList<>();
// if ("销售出库".equals(udiwmsOrderQueryRequest.getBillAction())) {
// for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
// if (udiwmsOrderResponses.get(i).getBillType().equals("销售出库")) {
// returnsList.add(udiwmsOrderResponses.get(i));
// }
// }
// } else if ("退货入库".equals(udiwmsOrderQueryRequest.getBillAction())) {
// for (int i = 0; i < udiwmsOrderResponses.size(); i++) {
// if (udiwmsOrderResponses.get(i).getBillType().equals("退货入库")) {
// returnsList.add(udiwmsOrderResponses.get(i));
// }
// }
// } else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) {
// returnsList.addAll(udiwmsOrderResponses);
// }
// PageSimpleResponse<UdiwmsOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal((long) returnsList.size());
// pageSimpleResponse.setList(returnsList);
// return ResultVOUtils.success(pageSimpleResponse);
// } else
// return ResultVOUtils.error(500, "未查询到数据");
} else {
return ResultVOUtils.error(500, "单据类型错误！");
}
@ -488,7 +494,7 @@ public class PzhzdClient implements BaseHttpClient {
return setEntity;
}
public List<UdiwmsOrderResponse> getPurchasein(UPurchaseinRequest uPurchaseinRequest) {
public BaseResponse getPurchasein(UPurchaseinRequest uPurchaseinRequest) {
uPurchaseinRequest.setCorp(setEntity.getUnitCode());
UBaseResponse<List<UPurchaseinQueryResponse>> response = uCloudHttpClient.purchaseinQuery(uPurchaseinRequest);
if (response != null) {
@ -532,13 +538,17 @@ public class PzhzdClient implements BaseHttpClient {
}
purchaseinResponses.add(udiwmsOrderResponse);
}
return purchaseinResponses;
PageSimpleResponse<UdiwmsOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(response.getData().getAllcount() + 0l);
pageSimpleResponse.setList(purchaseinResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}
return null;
return ResultVOUtils.error(500, "获取单据失败!");
}
public List<UdiwmsOrderResponse> getSaleout(USaleoutQueryRequest uSaleoutQueryRequest) {
public BaseResponse getSaleout(USaleoutQueryRequest uSaleoutQueryRequest) {
uSaleoutQueryRequest.setCorp(setEntity.getUnitCode());
UBaseResponse<List<USaleoutQueryResponse>> response = uCloudHttpClient.saleoutQuery(uSaleoutQueryRequest);
@ -582,10 +592,13 @@ public class PzhzdClient implements BaseHttpClient {
}
purchaseinResponses.add(purchaseinResponse);
}
return purchaseinResponses;
PageSimpleResponse<UdiwmsOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(response.getData().getAllcount() + 0l);
pageSimpleResponse.setList(purchaseinResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}
return null;
return ResultVOUtils.error(500, "下载出库单据失败！");
}
//采购入库单签字

3
src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java → src/main/java/com/glxp/mipsdl/dao/ptxyy/ThrHslbMapper.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.mipsdl.client.ptxhyy.entity;
package com.glxp.mipsdl.dao.ptxyy;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper

2
src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml
Unescape Escape View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbMapper">
<mapper namespace="com.glxp.mipsdl.dao.ptxyy.ThrHslbMapper">
</mapper>

Write Preview
Loading…
Cancel
Save