测试数据

workplace
anthonywj 11 months ago
parent 0e0c19f095
commit dce16042f0

@ -178,5 +178,9 @@ public class IoCollectOrderController extends BaseController {
return ResultVOUtils.success();
}
@GetMapping("/udiwms/collect/order/clearAll")
public BaseResponse clearAll() {
collectOrderService.clearOrder();
return ResultVOUtils.success();
}
}

@ -13,4 +13,6 @@ public interface IoCollectOrderMapper extends BaseMapper<IoCollectOrder> {
List<IoCollectOrderResponse> filterList(CollectOrderRequest collectOrderRequest);
void clearOrder();
}

@ -1,10 +1,18 @@
package com.glxp.api.service.basic;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity;
import com.glxp.api.dao.basic.BasicSkPrescirbeDetailMapper;
import java.util.List;
@Service
public class BasicSkPrescirbeDetailService extends ServiceImpl<BasicSkPrescirbeDetailMapper, BasicSkPrescribeItemEntity> {
public List<BasicSkPrescribeItemEntity> findByPrescribeNum(String prescribeNum) {
return list(new LambdaQueryWrapper<BasicSkPrescribeItemEntity>().eq(BasicSkPrescribeItemEntity::getPrescribeCode, prescribeNum));
}
}

@ -6,20 +6,24 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.collect.IoCollectOrderMapper;
import com.glxp.api.entity.basic.BasicCollectBustypeEntity;
import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity;
import com.glxp.api.entity.collect.IoCollectOrder;
import com.glxp.api.entity.collect.IoCollectOrderBiz;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.req.collect.CollectOrderRequest;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.collect.IoCollectOrderResponse;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.service.basic.BasicCollectBustypeService;
import com.glxp.api.service.basic.BasicSkPrescirbeDetailService;
import com.glxp.api.service.basic.BasicSkPrescribeService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.MsDateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -61,11 +65,25 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
IoCollectOrderBizService collectOrderBizService;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
BasicSkPrescribeService basicSkPrescribeService;
@Resource
BasicSkPrescirbeDetailService basicSkPrescirbeDetailService;
/**
*
*/
public void importOrder() {
importUdi();
importPrescribe();
}
public void clearOrder() {
collectOrderMapper.clearOrder();
}
public void importUdi() {
//下载UDI内部单据
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setPage(1);
filterOrderRequest.setLimit(1000);
@ -81,7 +99,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
IoCollectOrder collectOrder = IoCollectOrder.builder()
.billNo(ioOrderEntity.getBillNo())
.busType(collectBustypeEntity.getCode())
.fromType("内部单据")
.fromType(collectBustypeEntity.getFromType())
.fromCorp(ioOrderEntity.getFromName())
.billTime(ioOrderEntity.getCreateTime())
.createTime(ioOrderEntity.getCreateTime())
@ -121,9 +139,69 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
if (CollUtil.isNotEmpty(collectOrderBizs))
collectOrderBizService.saveBatch(collectOrderBizs);
}
if (CollUtil.isNotEmpty(collectOrderList))
if (CollUtil.isNotEmpty(collectOrderList)) {
saveBatch(collectOrderList);
}
}
public void importPrescribe() {
//下载处方
List<BasicSkPrescribeEntity> basicSkPrescribeEntities = basicSkPrescribeService.list();
List<IoCollectOrder> collectOrderList = new ArrayList<>();
for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) {
BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByAddr(basicSkPrescribeEntity.getWorkPlaceCode());
if (collectBustypeEntity == null)
continue;
if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) {
continue;
}
IoCollectOrder collectOrder = IoCollectOrder.builder()
.billNo(basicSkPrescribeEntity.getCode())
.busType(collectBustypeEntity.getCode())
.fromType(collectBustypeEntity.getFromType())
.fromCorp(basicSkPrescribeEntity.getSickerCode())
.billTime(MsDateUtil.localToDate(basicSkPrescribeEntity.getCreateTime()))
.createTime(new Date())
.createUser(basicSkPrescribeEntity.getCreateUser())
.updateTime(new Date())
.splitStatus(0)
.tagStatus(0)
.build();
collectOrderList.add(collectOrder);
List<BasicSkPrescribeItemEntity> basicSkPrescribeItemEntities = basicSkPrescirbeDetailService.findByPrescribeNum(basicSkPrescribeEntity.getCode());
List<IoCollectOrderBiz> collectOrderBizs = new ArrayList<>();
for (BasicSkPrescribeItemEntity bizEntity : basicSkPrescribeItemEntities) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getRelId() + "");
IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo())
.relId(bizEntity.getRelId())
.thrCode(bizEntity.getItemCode())
.ybbm(udiRelevanceResponse.getYbbm())
.payFeeCode(udiRelevanceResponse.getPayFeeCode())
.cpmctymc(bizEntity.getItemName())
.nameCode(udiRelevanceResponse.getNameCode())
.ggxh(bizEntity.getGgxh())
.batchNo(bizEntity.getBatchNo())
.count(IntUtil.value(bizEntity.getMeasureCount()))
.measureUnit(bizEntity.getMeasureUnit())
.tagStatus(1)
.unTagCount(bizEntity.getCount()).build();
// if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 2) {
// collectOrderBiz.setGgxh(udiRelevanceResponse.getBzgg());
// collectOrderBiz.setMeasureUnit(udiRelevanceResponse.getPrepnUnit());
// }
collectOrderBizs.add(collectOrderBiz);
}
if (CollUtil.isNotEmpty(collectOrderBizs))
collectOrderBizService.saveBatch(collectOrderBizs);
}
if (CollUtil.isNotEmpty(collectOrderList)) {
saveBatch(collectOrderList);
}
}
}

@ -12,6 +12,9 @@ import java.lang.management.ManagementFactory;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.*;
@Slf4j
@ -708,4 +711,14 @@ public class MsDateUtil extends DateUtils {
Date dt1 = rightNow.getTime();
return dt1;
}
public static Date localToDate(LocalDateTime localDateTime) {
if (localDateTime == null)
return null;
// 将LocalDateTime转换为ZonedDateTime需要指定时区
ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.systemDefault());
// 使用ZonedDateTime的toInstant()方法转换为Instant然后调用Date.from(Instant)获取Date
return Date.from(zonedDateTime.toInstant());
}
}

@ -49,4 +49,19 @@
</where>
order by collectTime desc
</select>
<select id="clearOrder">
-- 清除拆零队列
TRUNCATE io_split_code;
TRUNCATE io_split_code_detail;
TRUNCATE io_split_fifo_code;
-- 清除拆零,原始单据等
TRUNCATE io_collect_order;
TRUNCATE io_collect_order_biz;
TRUNCATE io_collect_order_code_auto;
TRUNCATE io_collect_order_code_man
</select>
</mapper>

Loading…
Cancel
Save