|
|
|
@ -2,19 +2,13 @@ package com.glxp.udi.admin.controller;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
import com.glxp.udi.admin.dao.inout.*;
|
|
|
|
import com.glxp.udi.admin.dao.inout.UdiInfoDao;
|
|
|
|
|
|
|
|
import com.glxp.udi.admin.entity.inout.*;
|
|
|
|
import com.glxp.udi.admin.entity.inout.*;
|
|
|
|
import com.glxp.udi.admin.entity.inout.WarehousetempEntity;
|
|
|
|
|
|
|
|
import com.glxp.udi.admin.entity.mongo.*;
|
|
|
|
import com.glxp.udi.admin.entity.mongo.*;
|
|
|
|
import com.glxp.udi.admin.mongo.dao.*;
|
|
|
|
import com.glxp.udi.admin.mongo.dao.*;
|
|
|
|
import com.glxp.udi.admin.mongo.service.InvProductDetailService;
|
|
|
|
import com.glxp.udi.admin.service.inout.OrderDetailService;
|
|
|
|
import com.glxp.udi.admin.mongo.service.InvProductService;
|
|
|
|
|
|
|
|
import com.glxp.udi.admin.mongo.service.OrderDetailService;
|
|
|
|
|
|
|
|
import com.glxp.udi.admin.req.inout.FilterOrderDetailRequest;
|
|
|
|
|
|
|
|
import com.glxp.udi.admin.req.inout.FilterInvProductDetailRequest;
|
|
|
|
|
|
|
|
import com.glxp.udi.admin.req.inventory.FilterInvProductRequest;
|
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
@ -22,6 +16,9 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* todo 正式上线完成数据迁移之后，删除此接口
|
|
|
|
|
|
|
|
*/
|
|
|
|
@Slf4j
|
|
|
|
@Slf4j
|
|
|
|
@RestController
|
|
|
|
@RestController
|
|
|
|
public class TestController {
|
|
|
|
public class TestController {
|
|
|
|
@ -29,10 +26,6 @@ public class TestController {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private OrderDetailService orderDetailService;
|
|
|
|
private OrderDetailService orderDetailService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private InvProductService invProductService;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private InvProductDetailService invProductDetailService;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private UdiInfoDao udiInfoDao;
|
|
|
|
private UdiInfoDao udiInfoDao;
|
|
|
|
|
|
|
|
|
|
|
|
//mongodb dao
|
|
|
|
//mongodb dao
|
|
|
|
@ -51,71 +44,46 @@ public class TestController {
|
|
|
|
|
|
|
|
|
|
|
|
//mysql dao
|
|
|
|
//mysql dao
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private com.glxp.udi.admin.dao.inout.OrderDao orderDao;
|
|
|
|
private OrderDao orderDao;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private com.glxp.udi.admin.dao.inout.OrderDetailDao orderDetailDao;
|
|
|
|
private OrderDetailDao orderDetailDao;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private com.glxp.udi.admin.dao.inout.CodesDao codesDao;
|
|
|
|
private CodesDao codesDao;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private com.glxp.udi.admin.dao.inout.CodesTempDao codesTempDao;
|
|
|
|
private CodesTempDao codesTempDao;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private com.glxp.udi.admin.dao.inout.InvProductDao invProductDao;
|
|
|
|
private InvProductDao invProductDao;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private com.glxp.udi.admin.dao.inout.InvProductDetailDao invProductDetailDao;
|
|
|
|
private InvProductDetailDao invProductDetailDao;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 填充relId产品ID关联字段值
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
@GetMapping("/test/refreshOrderData")
|
|
|
|
@GetMapping("/test/refreshOrderData")
|
|
|
|
private String refreshOrderData() {
|
|
|
|
private String refreshOrderData() {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
//刷新订单详情表的数据
|
|
|
|
//刷新码详情数据
|
|
|
|
List<OrderDetailEntity> erpOrderEntities = orderDetailService.filterOrderDetails(new FilterOrderDetailRequest());
|
|
|
|
List<WarehouseEntity> warehouseEntities = codesDao.selectList(null);
|
|
|
|
/*erpOrderEntities.forEach(orderDetail -> {
|
|
|
|
warehouseEntities.forEach(code -> {
|
|
|
|
String orderId = orderDetail.getOrderIdFk();
|
|
|
|
UdiInfoEntity udiInfoEntity = udiInfoDao.selectById(code.getRelId());
|
|
|
|
if (StrUtil.isNotBlank(orderId)) {
|
|
|
|
code.setRelId(udiInfoEntity.getUuid());
|
|
|
|
OrderMdEntity order = orderMdService.findByOne(orderId);
|
|
|
|
codesDao.updateById(code);
|
|
|
|
if (null != order) {
|
|
|
|
|
|
|
|
UdiInfoEntity udiInfoEntity = udiInfoDao.selectOne(new QueryWrapper<UdiInfoEntity>().eq(StrUtil.isNotBlank(orderDetail.getUuidFk()), "uuid", orderDetail.getUuidFk())
|
|
|
|
|
|
|
|
.eq(null != order.getCustomerId(), "customerId", order.getCustomerId())
|
|
|
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderDetail.getPackSpec()), "ggxh", orderDetail.getPackSpec())
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
if (udiInfoEntity != null) {
|
|
|
|
|
|
|
|
orderDetail.setRelId(String.valueOf(udiInfoEntity.getId()));
|
|
|
|
|
|
|
|
log.info("刷新单据详情");
|
|
|
|
|
|
|
|
orderDetailMdService.updateOrderDetail(orderDetail);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//刷新库存表的数据
|
|
|
|
|
|
|
|
List<InvProductEntity> invProductEntities = invProductService.filterInvProductList(new FilterInvProductRequest());
|
|
|
|
|
|
|
|
invProductEntities.forEach(invProductEntity -> {
|
|
|
|
|
|
|
|
UdiInfoEntity udiInfoEntity = udiInfoDao.selectOne(new QueryWrapper<UdiInfoEntity>().eq(StrUtil.isNotBlank(invProductEntity.getRelIdFk()), "uuid", invProductEntity.getRelIdFk())
|
|
|
|
|
|
|
|
.eq(StrUtil.isNotBlank(invProductEntity.getCustomerId()), "customerId", invProductEntity.getCustomerId())
|
|
|
|
|
|
|
|
.eq(StrUtil.isNotBlank(invProductEntity.getGgxh()), "ggxh", invProductEntity.getGgxh())
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
if (null != udiInfoEntity) {
|
|
|
|
|
|
|
|
invProductEntity.setRelIdFk(String.valueOf(udiInfoEntity.getId()));
|
|
|
|
|
|
|
|
log.info("刷新库存");
|
|
|
|
|
|
|
|
invProductService.updateInvProduct(invProductEntity);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
//刷新库存详情表数据
|
|
|
|
//刷新临时码表
|
|
|
|
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterAllInvProduct(new FilterInvProductDetailRequest());
|
|
|
|
List<WarehousetempEntity> warehousetempEntities = codesTempDao.selectList(null);
|
|
|
|
invProductDetailEntities.forEach(invProductDetailEntity -> {
|
|
|
|
warehousetempEntities.forEach(codesTemp -> {
|
|
|
|
UdiInfoEntity udiInfoEntity = udiInfoDao.selectOne(new QueryWrapper<UdiInfoEntity>().eq(StrUtil.isNotBlank(invProductDetailEntity.getProductIdFk()), "uuid", invProductDetailEntity.getProductIdFk())
|
|
|
|
UdiInfoEntity udiInfoEntity = udiInfoDao.selectById(codesTemp.getRelId());
|
|
|
|
.eq(StrUtil.isNotBlank(invProductDetailEntity.getCustomerId()), "customerId", invProductDetailEntity.getCustomerId())
|
|
|
|
codesTemp.setRelId(udiInfoEntity.getUuid());
|
|
|
|
);
|
|
|
|
codesTempDao.updateById(codesTemp);
|
|
|
|
if (null != udiInfoEntity) {
|
|
|
|
|
|
|
|
invProductDetailEntity.setProductIdFk(String.valueOf(udiInfoEntity.getId()));
|
|
|
|
|
|
|
|
log.info("刷新库存详情");
|
|
|
|
|
|
|
|
invProductDetailService.updateInvProduct(invProductDetailEntity);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
return "success";
|
|
|
|
return "success";
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|
e.printStackTrace();
|
|
|
|
log.error(e.getMessage(), e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return "error";
|
|
|
|
return "error";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -148,6 +116,8 @@ public class TestController {
|
|
|
|
BeanUtil.copyProperties(orderMdDetail, orderDetailEntity, "id");
|
|
|
|
BeanUtil.copyProperties(orderMdDetail, orderDetailEntity, "id");
|
|
|
|
orderDetailEntity.setBatchNo(orderMdDetail.getLotno());
|
|
|
|
orderDetailEntity.setBatchNo(orderMdDetail.getLotno());
|
|
|
|
orderDetailEntity.setProductName(orderMdDetail.getCoName());
|
|
|
|
orderDetailEntity.setProductName(orderMdDetail.getCoName());
|
|
|
|
|
|
|
|
orderDetailEntity.setZczbhhzbapzbh(orderMdDetail.getAuthCode());
|
|
|
|
|
|
|
|
orderDetailEntity.setGgxh(orderMdDetail.getPackSpec());
|
|
|
|
orderDetailDao.insert(orderDetailEntity);
|
|
|
|
orderDetailDao.insert(orderDetailEntity);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -159,6 +129,10 @@ public class TestController {
|
|
|
|
codesList.forEach(code -> {
|
|
|
|
codesList.forEach(code -> {
|
|
|
|
WarehouseEntity warehouseEntity = new WarehouseEntity();
|
|
|
|
WarehouseEntity warehouseEntity = new WarehouseEntity();
|
|
|
|
BeanUtil.copyProperties(code, warehouseEntity, "id");
|
|
|
|
BeanUtil.copyProperties(code, warehouseEntity, "id");
|
|
|
|
|
|
|
|
String actDate = warehouseEntity.getActDate();
|
|
|
|
|
|
|
|
String date = DateUtil.parse(actDate).toString("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
|
|
warehouseEntity.setActDate(date);
|
|
|
|
|
|
|
|
warehouseEntity.setNameCode(code.getUdi());
|
|
|
|
codesDao.insert(warehouseEntity);
|
|
|
|
codesDao.insert(warehouseEntity);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -170,6 +144,7 @@ public class TestController {
|
|
|
|
codesTempList.forEach(codesTemp -> {
|
|
|
|
codesTempList.forEach(codesTemp -> {
|
|
|
|
WarehousetempEntity warehousetempEntity = new WarehousetempEntity();
|
|
|
|
WarehousetempEntity warehousetempEntity = new WarehousetempEntity();
|
|
|
|
BeanUtil.copyProperties(codesTemp, warehousetempEntity, "id");
|
|
|
|
BeanUtil.copyProperties(codesTemp, warehousetempEntity, "id");
|
|
|
|
|
|
|
|
warehousetempEntity.setNameCode(codesTemp.getUdi());
|
|
|
|
codesTempDao.insert(warehousetempEntity);
|
|
|
|
codesTempDao.insert(warehousetempEntity);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -181,6 +156,9 @@ public class TestController {
|
|
|
|
invList.forEach(inv -> {
|
|
|
|
invList.forEach(inv -> {
|
|
|
|
InvProductEntity invProductEntity = new InvProductEntity();
|
|
|
|
InvProductEntity invProductEntity = new InvProductEntity();
|
|
|
|
BeanUtil.copyProperties(inv, invProductEntity, "id");
|
|
|
|
BeanUtil.copyProperties(inv, invProductEntity, "id");
|
|
|
|
|
|
|
|
if (StrUtil.isNotBlank(inv.getProductionDate())) {
|
|
|
|
|
|
|
|
invProductEntity.setProductDate(inv.getProductionDate());
|
|
|
|
|
|
|
|
}
|
|
|
|
invProductDao.insert(invProductEntity);
|
|
|
|
invProductDao.insert(invProductEntity);
|
|
|
|
if (StrUtil.isNotBlank(invProductEntity.getId())) {
|
|
|
|
if (StrUtil.isNotBlank(invProductEntity.getId())) {
|
|
|
|
//拷贝；临时码表的数据
|
|
|
|
//拷贝；临时码表的数据
|
|
|
|
@ -190,8 +168,12 @@ public class TestController {
|
|
|
|
if (CollUtil.isNotEmpty(invDetailList)) {
|
|
|
|
if (CollUtil.isNotEmpty(invDetailList)) {
|
|
|
|
invDetailList.forEach(invDetail -> {
|
|
|
|
invDetailList.forEach(invDetail -> {
|
|
|
|
InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
|
|
|
|
InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
|
|
|
|
BeanUtil.copyProperties(inv, invProductDetailEntity, "id");
|
|
|
|
BeanUtil.copyProperties(invDetail, invProductDetailEntity, "id");
|
|
|
|
invProductDetailEntity.setProductIdFk(invProductEntity.getId());
|
|
|
|
if (StrUtil.isNotBlank(invDetail.getProductionDate())) {
|
|
|
|
|
|
|
|
invProductDetailEntity.setProductDate(invDetail.getProductionDate());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
invProductDetailEntity.setProductIdFk(invDetail.getProductIdFk());
|
|
|
|
|
|
|
|
invProductDetailEntity.setInvProductIdFk(invProductEntity.getId());
|
|
|
|
invProductDetailDao.insert(invProductDetailEntity);
|
|
|
|
invProductDetailDao.insert(invProductDetailEntity);
|
|
|
|
log.info("插入库存详情数据");
|
|
|
|
log.info("插入库存详情数据");
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
x_z
3 years ago