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

转换为单据

Browse Source
scpwxyy
zane 10 months ago
parent d918fc9d32
commit d3a6477aec
5 changed files with 231 additions and 29 deletions
Show Stats Download Patch File Download Diff File

175
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -1374,6 +1374,93 @@ public class CtqyyClient extends CommonHttpClient {
//补充其他查询条件
IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper
.selectPage(new Page<VYpzsPresInfo>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper);
// List<VYpzsPresInfo> presInfoEntities = page.getRecords();
// if (CollUtil.isNotEmpty(presInfoEntities)) {
// //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回
// Map<String, List<VYpzsPresInfo>> groupedByPrescribeNumber = presInfoEntities.stream()
// .collect(Collectors.groupingBy(VYpzsPresInfo::getPRESCRIBE_NUMBER));
// List<BasicSkPrescribeResponse> basicSkPrescribeResponses = new ArrayList<>();
// List<BasicSkPrescribeResponse> finalBasicSkPrescribeResponses = basicSkPrescribeResponses;
// groupedByPrescribeNumber.forEach((key, value) -> {
// VYpzsPresInfo presInfoEntity = value.get(0);
// BasicSkPrescribeResponse basicSkPrescribeResponse = new BasicSkPrescribeResponse();
// basicSkPrescribeResponse.setSickCode(presInfoEntity.getSICK_ID());
// basicSkPrescribeResponse.setCode(presInfoEntity.getPRESCRIBE_NUMBER());
// basicSkPrescribeResponse.setStooutNo(presInfoEntity.getSTOOUT_NO());
// basicSkPrescribeResponse.setAddr("YPCF002");
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// LocalDateTime dateTime = LocalDateTime.parse(presInfoEntity.getLAY_TIME(), formatter);
// basicSkPrescribeResponse.setPrescribeDate(dateTime);
// List<BasicSkPrescribeItemEntity> itemList = new ArrayList<>();
// value.forEach(entity ->
// {
// BasicSkPrescribeItemEntity basicSkPrescribeItemEntity = new BasicSkPrescribeItemEntity();
// basicSkPrescribeItemEntity.setItemCode(entity.getPHYSIC_CODE());
// BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
// if (basicUdirelEntity != null) {
// basicSkPrescribeItemEntity.setRelId(basicUdirelEntity.getId());
// }
// basicSkPrescribeItemEntity.setItemName(entity.getPHYSIC_NAME());
// basicSkPrescribeItemEntity.setGgxh(entity.getPACK_SPEC());
// basicSkPrescribeItemEntity.setMeasureCount(entity.getLAY_PHYSIC_QUANTITY());
// basicSkPrescribeItemEntity.setMeasureUnit(entity.getPHYSIC_UNIT());
// itemList.add(basicSkPrescribeItemEntity);
// });
// basicSkPrescribeResponse.setItemList(itemList);
// finalBasicSkPrescribeResponses.add(basicSkPrescribeResponse);
// });
// PageSimpleResponse<BasicSkPrescribeResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(page.getTotal());
// pageSimpleResponse.setList(basicSkPrescribeResponses);
// return ResultVOUtils.success(pageSimpleResponse);
// } else {
// return ResultVOUtils.error(500, "下载失败!");
// }
return this.ioCollectOrder(udiwmsBasicSkPrescribeRequest,page);
}
/**
* 采购计划拉取视图
*
* @param udiwmsThrOrderRequest
* @return
*/
@Override
public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
LambdaQueryWrapper<VYpzsPlanInfo> wrapper = new LambdaQueryWrapper<>();
//补充其他查询条件
IPage<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectPage(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
List<VYpzsPlanInfo> planInfoEntities = page.getRecords();
List<ThrOrderResponse> thrOrderResponses = null;
if (CollUtil.isNotEmpty(planInfoEntities)) {
//数据处理以thr_order，thr_order_detail 主子返回
thrOrderResponses = planInfoEntities.stream().map(plan -> {
ThrOrderResponse thrOrderResponse = new ThrOrderResponse();
List<ThrOrderDetailEntity> detailList = new ArrayList<>();
ThrOrderDetailEntity detail = new ThrOrderDetailEntity();
//TODO 封装数据
detailList.add(detail);
thrOrderResponse.setDetailList(detailList);
return thrOrderResponse;
}).collect(Collectors.toList());
}
PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(thrOrderResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
* 中间表
* @param udiwmsBasicSkPrescribeRequest
* @return
*/
private BaseResponse basicSkPrescribe(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest,IPage<VYpzsPresInfo> page){
List<VYpzsPresInfo> presInfoEntities = page.getRecords();
if (CollUtil.isNotEmpty(presInfoEntities)) {
//数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回
@ -1416,41 +1503,71 @@ public class CtqyyClient extends CommonHttpClient {
} else {
return ResultVOUtils.error(500, "下载失败!");
}
}
/**
* 采购计划拉取视图
*
* @param udiwmsThrOrderRequest
* 单据
* @param udiwmsBasicSkPrescribeRequest
* @return
*/
@Override
public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
LambdaQueryWrapper<VYpzsPlanInfo> wrapper = new LambdaQueryWrapper<>();
//补充其他查询条件
IPage<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectPage(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
List<VYpzsPlanInfo> planInfoEntities = page.getRecords();
List<ThrOrderResponse> thrOrderResponses = null;
if (CollUtil.isNotEmpty(planInfoEntities)) {
//数据处理以thr_order，thr_order_detail 主子返回
thrOrderResponses = planInfoEntities.stream().map(plan -> {
ThrOrderResponse thrOrderResponse = new ThrOrderResponse();
List<ThrOrderDetailEntity> detailList = new ArrayList<>();
ThrOrderDetailEntity detail = new ThrOrderDetailEntity();
//TODO 封装数据
detailList.add(detail);
thrOrderResponse.setDetailList(detailList);
return thrOrderResponse;
}).collect(Collectors.toList());
private BaseResponse ioCollectOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest,IPage<VYpzsPresInfo> page){
List<VYpzsPresInfo> presInfoEntities = page.getRecords();
if (CollUtil.isNotEmpty(presInfoEntities)) {
//数据处理以io_collect_order，io_collect_order_biz 主子返回
Map<String, List<VYpzsPresInfo>> groupedByPrescribeNumber = presInfoEntities.stream()
.collect(Collectors.groupingBy(VYpzsPresInfo::getPRESCRIBE_NUMBER));
List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
groupedByPrescribeNumber.forEach((key, value) -> {
VYpzsPresInfo presInfoEntity = value.get(0);
IoCollectOrder ioCollectOrder = new IoCollectOrder();
ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getDocumentTypeCode());
ioCollectOrder.setFromType("HIS系统");
ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
ioCollectOrder.setWorkPlaceCode(Long.valueOf(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()));
Date date = DateUtil.parseDate(presInfoEntity.getLAY_TIME());
ioCollectOrder.setBillTime(date);
ioCollectOrder.setCreateTime(new Date());
ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO());
ioCollectOrder.setUpdateTime(new Date());
ioCollectOrder.setOrderCirType(udiwmsBasicSkPrescribeRequest.getOrderCirType());
ioCollectOrder.setSplitStatus(0);
ioCollectOrder.setTagStatus(0);
List<CollectOrderBizResponse> detailList = new ArrayList<>();
value.forEach(entity ->
{
CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
BasicUdirelEntity basicUdirel = new BasicUdirelEntity();
basicUdirel.setMainId(entity.getPHYSIC_CODE());
UdiRelevanceResponse udiRelevanceResponse = basicUdirelDao.selectOneUdi(basicUdirel);
if (udiRelevanceResponse != null) {
collectOrderBizResponse.setRelId(udiRelevanceResponse.getId());
collectOrderBizResponse.setYbbm(udiRelevanceResponse.getYbbm());
collectOrderBizResponse.setPayFeeCode(udiRelevanceResponse.getPayFeeCode());
collectOrderBizResponse.setNameCode(udiRelevanceResponse.getNameCode());
}
collectOrderBizResponse.setThrCode(entity.getPHYSIC_CODE());
collectOrderBizResponse.setCpmctymc(entity.getPHYSIC_NAME());
collectOrderBizResponse.setGgxh(entity.getPACK_SPEC());
collectOrderBizResponse.setBatchNo("");
collectOrderBizResponse.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY()));
collectOrderBizResponse.setMeasureUnit(entity.getPHYSIC_UNIT());
collectOrderBizResponse.setTagStatus(1);
collectOrderBizResponse.setUnTagCount(0);
detailList.add(collectOrderBizResponse);
});
ioCollectOrder.setCollectOrderBizResponseList(detailList);
ioCollectOrders.add(ioCollectOrder);
});
PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(ioCollectOrders);
return ResultVOUtils.success(pageSimpleResponse);
} else {
return ResultVOUtils.error(500, "下载失败!");
}
PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(page.getTotal());
pageSimpleResponse.setList(thrOrderResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}

3
src/main/java/com/glxp/mipsdl/dao/basic/BasicUdirelDao.java
Unescape Escape View File

@ -2,10 +2,13 @@ package com.glxp.mipsdl.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
import com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface BasicUdirelDao extends BaseMapper<BasicUdirelEntity> {
public BasicUdirelEntity selectByNameCode(String nameCode);
UdiRelevanceResponse selectOneUdi(BasicUdirelEntity basicUdirel);
}

7
src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java
Unescape Escape View File

@ -114,5 +114,12 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest {
private String stooutNo;
/**
* 单据流通方式： 1:配送流通; 2:出库使用
*/
private Integer orderCirType;
//单据编码
private String documentTypeCode;
}

2
src/main/java/com/glxp/mipsdl/res/udiwms/UdiRelevanceResponse.java
Unescape Escape View File

@ -127,6 +127,8 @@ public class UdiRelevanceResponse {
private Integer count;
private Long deId;
private String payFeeCode;
private Integer bpcrid;

73
src/main/resources/mybatis/mapper/master/basic/BasicUdirelDao.xml
Unescape Escape View File

@ -42,4 +42,77 @@
where basic_products.nameCode = #{nameCode}
limit 1
</select>
<select id="selectOneUdi" parameterType="com.glxp.mipsdl.entity.basic.BasicUdirelEntity" resultType="com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse">
select bu.*,
bp.originUuid,
bp.nameCode,
bp.deviceRecordKey,
bp.packRatio,
bp.packUnit,
bp.packLevel,
bp.bhxjsl,
bp.bhzxxsbzsl,
bp.zxxsbzbhsydysl,
bp.bhxjcpbm,
bp.bzcj,
bp.cpmctymc,
bp.cplb,
bp.flbm,
bp.ggxh,
bp.qxlb,
bp.tyshxydm,
bp.ylqxzcrbarmc,
bp.zczbhhzbapzbh,
bp.ylqxzcrbarywmc,
bp.sydycpbs,
bp.sjcpbm,
bp.versionNumber,
bp.diType,
bp.ybbm,
bp.sptm,
bp.manufactory,
bp.measname,
bp.productType,
bp.scbssfbhph,
bp.scbssfbhxlh,
bp.scbssfbhscrq,
bp.scbssfbhsxrq,
bp.cpms,
bp.allowNoBatch,
bp.allowNoExpire,
bp.allowNoProduct,
bp.allowNoSerial,
bp.spmc,
bp.cplx,
bp.hchzsb,
bp.cpdls,
bp.basicPrductRemak1,
bp.basicPrductRemak2,
bp.basicPrductRemak3,
bp.basicPrductRemak4,
bp.basicPrductRemak5,
bp.basicPrductRemak6,
bp.basicPrductRemak7,
bp.basicPrductRemak8,
bp.sfwblztlcp,
bp.cgzmraqxgxx,
bp.sfbjwycxsy,
bp.zdcfsycs,
bp.sfwwjbz,
bp.syqsfxyjxmj,
bp.mjfs,
bp.categoryName
from basic_udirel bu
inner JOIN basic_products bp ON bp.uuid = bu.uuid
<where>
<if test="id != null ">
AND bu.id = #{id}
</if>
<if test="mainId != '' and mainId != null">
AND bu.mainId = #{mainId}
</if>
</where>
limit 1
</select>
</mapper>

Write Preview
Loading…
Cancel
Save