|
|
|
@ -370,15 +370,18 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
products.setSpec(dict.getBzgg());
|
|
|
|
|
products.setProductType(2);
|
|
|
|
|
products.setRegisterNo(dict.getRegisterno());
|
|
|
|
|
products.setThirdSysFk("thirdId1");
|
|
|
|
|
products.setId(IdUtil.getSnowflakeNextId());
|
|
|
|
|
return products;
|
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
thrProductsDao.batchInsert(thrProductsEntityList);
|
|
|
|
|
for (ThrProductsEntity entity : thrProductsEntityList) {
|
|
|
|
|
entity.setId(null);
|
|
|
|
|
entity.setRemark(entity.getCode());
|
|
|
|
|
entity.setCode(entity.getYbbm());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
thrProductsDao.batchInsert(thrProductsEntityList);
|
|
|
|
|
for (ThrProductsEntity entity : thrProductsEntityList) {
|
|
|
|
|
entity.setId(null);
|
|
|
|
|
entity.setRemark(entity.getCode());
|
|
|
|
|
entity.setCode(entity.getYbbm());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(page.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(thrProductsEntityList);
|
|
|
|
@ -766,7 +769,7 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
.selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo())
|
|
|
|
|
.eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk())
|
|
|
|
|
.eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()).
|
|
|
|
|
groupBy(IoOrderInvoiceEntity::getInvoiceEncode));
|
|
|
|
|
groupBy(IoOrderInvoiceEntity::getInvoiceEncode));
|
|
|
|
|
if (CollectionUtil.isNotEmpty(invoiceList)) {
|
|
|
|
|
fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(","));
|
|
|
|
|
if (invoiceList.get(0).getInvoiceDate() != null)
|
|
|
|
@ -1483,6 +1486,7 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public BaseResponse getPrescribesQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
|
|
|
|
|
if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) {
|
|
|
|
@ -1777,7 +1781,7 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
if (CollUtil.isNotEmpty(itemDetails)) {
|
|
|
|
|
itemDetails.forEach(entity -> {
|
|
|
|
|
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
|
|
|
|
|
BeanUtils.copyProperties(entity,collectOrderBiz);
|
|
|
|
|
BeanUtils.copyProperties(entity, collectOrderBiz);
|
|
|
|
|
|
|
|
|
|
List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getItemcode()));
|
|
|
|
|
if (CollUtil.isNotEmpty(basicUdirelEntities)) {
|
|
|
|
@ -1892,7 +1896,7 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
if (CollUtil.isNotEmpty(itemDetails)) {
|
|
|
|
|
itemDetails.forEach(entity -> {
|
|
|
|
|
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
|
|
|
|
|
BeanUtils.copyProperties(entity,collectOrderBiz);
|
|
|
|
|
BeanUtils.copyProperties(entity, collectOrderBiz);
|
|
|
|
|
List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getItemcode()));
|
|
|
|
|
if (CollUtil.isNotEmpty(basicUdirelEntities)) {
|
|
|
|
|
BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0);
|
|
|
|
@ -2230,8 +2234,9 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
public String getDataSourceType(){
|
|
|
|
|
return defXmlSqlType;
|
|
|
|
|
|
|
|
|
|
public String getDataSourceType() {
|
|
|
|
|
return defXmlSqlType;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2296,7 +2301,7 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
if (CollUtil.isNotEmpty(itemDetails)) {
|
|
|
|
|
itemDetails.forEach(entity -> {
|
|
|
|
|
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
|
|
|
|
|
BeanUtils.copyProperties(entity,collectOrderBiz);
|
|
|
|
|
BeanUtils.copyProperties(entity, collectOrderBiz);
|
|
|
|
|
|
|
|
|
|
List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getItemcode()));
|
|
|
|
|
if (CollUtil.isNotEmpty(basicUdirelEntities)) {
|
|
|
|
@ -2338,6 +2343,7 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
return ResultVOUtils.error(500, "未查询到数据!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private BaseResponse covertReturnOrderQx(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VA015> iPage) {
|
|
|
|
|
List<VA015> headList = iPage.getRecords();
|
|
|
|
|
// log.info("udiwmsBasicSkPrescribeRequest=="+udiwmsBasicSkPrescribeRequest+"====="+headList);
|
|
|
|
@ -2393,7 +2399,7 @@ public class HlfyyyClient extends CommonHttpClient {
|
|
|
|
|
if (CollUtil.isNotEmpty(itemDetails)) {
|
|
|
|
|
itemDetails.forEach(entity -> {
|
|
|
|
|
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
|
|
|
|
|
BeanUtils.copyProperties(entity,collectOrderBiz);
|
|
|
|
|
BeanUtils.copyProperties(entity, collectOrderBiz);
|
|
|
|
|
List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getItemcode()));
|
|
|
|
|
if (CollUtil.isNotEmpty(basicUdirelEntities)) {
|
|
|
|
|
BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0);
|
|
|
|
|