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

上线bug修改，同步修改，发票修改

Browse Source
master
anthonywj 2 years ago
parent 3d28e40a03
commit cc248bab94
26 changed files with 209 additions and 72 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
@ -575,6 +576,7 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
ioOrderInvoiceEntity.setCreateTime(new Date());
ioOrderInvoiceEntity.setUpdateTime(new Date());
ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
return ResultVOUtils.success("成功");
@ -592,7 +594,7 @@ public class IoOrderDetailBizController extends BaseController {
List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
for (IoOrderDetailBizResponse ioOrderDetailBizResponse : list) {
String msg = "";
IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizResponse.getOrderIdFk());
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {

62
src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
Unescape Escape View File

@ -0,0 +1,62 @@
package com.glxp.api.controller.inout;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.idc.service.FileService;
import com.glxp.api.req.inout.AddBizProductReqeust;
import com.glxp.api.req.inout.RefreshInoiceRequest;
import com.glxp.api.service.inout.IoOrderInvoiceService;
import com.glxp.api.service.inout.IoOrderService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@RestController
public class IoOrderInvoiceController {
@Resource
IoOrderInvoiceMapper orderInvoiceMapper;
@Resource
SpGetHttpClient spGetHttpClient;
@Resource
FileService fileService;
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/refrshInvoice")
@Log(title = "发票", businessType = BusinessType.INSERT)
public BaseResponse addBizProduct(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
BaseResponse<List<IoOrderInvoiceEntity>> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
if (baseResponse.getCode() == 20000) {
List<IoOrderInvoiceEntity> orderInvoiceEntities = baseResponse.getData();
if (CollUtil.isNotEmpty(orderInvoiceEntities)) {
List<String> syncFiles = new ArrayList<>();
for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
if (StrUtil.isNotEmpty(orderInvoiceEntity.getLicenseUrl())) {
syncFiles.add(orderInvoiceEntity.getLicenseUrl());
}
orderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
}
if (CollUtil.isNotEmpty(syncFiles)) {
fileService.download(syncFiles);
}
}
return ResultVOUtils.success("更新成功！");
} else
return baseResponse;
}
}

14
src/main/java/com/glxp/api/dao/BaseMapperPlus.java
Unescape Escape View File

@ -82,7 +82,7 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
default boolean insertBatch(Collection<T> entityList, int batchSize) {
String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.INSERT_ONE);
return SqlHelper.executeBatch(this.currentModelClass(), log, entityList, batchSize,
(sqlSession, entity) -> sqlSession.insert(sqlStatement, entity));
(sqlSession, entity) -> sqlSession.insert(sqlStatement, entity));
}
/**
@ -91,11 +91,11 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
default boolean updateBatchById(Collection<T> entityList, int batchSize) {
String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.UPDATE_BY_ID);
return SqlHelper.executeBatch(this.currentModelClass(), log, entityList, batchSize,
(sqlSession, entity) -> {
MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
param.put(Constants.ENTITY, entity);
sqlSession.update(sqlStatement, param);
});
(sqlSession, entity) -> {
MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
param.put(Constants.ENTITY, entity);
sqlSession.update(sqlStatement, param);
});
}
/**
@ -110,7 +110,7 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
Object idVal = tableInfo.getPropertyValue(entity, keyProperty);
String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.SELECT_BY_ID);
return StringUtils.checkValNull(idVal)
|| CollectionUtils.isEmpty(sqlSession.selectList(sqlStatement, entity));
|| CollectionUtils.isEmpty(sqlSession.selectList(sqlStatement, entity));
}, (sqlSession, entity) -> {
MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
param.put(Constants.ENTITY, entity);

4
src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.dao.inout;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.req.inout.IoOrderInvoiceRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -12,5 +13,6 @@ public interface IoOrderInvoiceMapper extends BaseMapperPlus<IoOrderInvoiceMappe
boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceEntity);
}

2
src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java
Unescape Escape View File

@ -13,7 +13,7 @@ import lombok.Data;
@TableName(value = "io_order_invoice")
public class IoOrderInvoiceEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Long id;
/**
* 订单号外键

2
src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java
Unescape Escape View File

@ -67,6 +67,6 @@ public class SyncDataSetEntity {
private int companyCert;
private int manufacturerCert;
private int productCert;
private int orderInvoice; //发票信息
}

14
src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
Unescape Escape View File

@ -10,11 +10,13 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicExportTypeEnum;
import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.entity.sync.BasicExportStatusEntity;
import com.glxp.api.entity.sync.IOOrderStatusEntity;
import com.glxp.api.entity.system.SyncDataSetEntity;
import com.glxp.api.idc.service.FileService;
import com.glxp.api.req.basic.ProductInfoFilterRequest;
import com.glxp.api.req.inout.RefreshInoiceRequest;
import com.glxp.api.req.inout.ReviewFinishRequest;
import com.glxp.api.req.inout.ReviewSpmsRequest;
import com.glxp.api.req.sync.BasicExportStatusRequest;
@ -122,6 +124,16 @@ public class SpGetHttpClient {
return response;
}
public BaseResponse<List<IoOrderInvoiceEntity>> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) {
String json = JSONUtil.toJsonStr(refreshInoiceRequest);
String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader());
BaseResponse<List<IoOrderInvoiceEntity>> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<List<IoOrderInvoiceEntity>>>() {
});
return response;
}
//验收自助平台单据--直连接口
public BaseResponse<String> reviewOrder(ReviewFinishRequest reviewFinishRequest) {
String json = JSONUtil.toJsonStr(reviewFinishRequest);
@ -214,7 +226,7 @@ public class SpGetHttpClient {
}
public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type,String status) {
public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type, String status) {
Map<String, String> paramMap = new HashMap<>(16);
paramMap.put("type", type);
paramMap.put("status", status);

2
src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java
Unescape Escape View File

@ -19,7 +19,7 @@ import java.util.List;
@Data
public class IoOrderInvoiceRequest {
private Integer id;
private Long id;
private String orderIdFk;

11
src/main/java/com/glxp/api/req/inout/RefreshInoiceRequest.java
Unescape Escape View File

@ -0,0 +1,11 @@
package com.glxp.api.req.inout;
import lombok.Data;
@Data
public class RefreshInoiceRequest {
private Long id;
private String orderIdFk;
private Long bizIdFk;
}

2
src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java
Unescape Escape View File

@ -8,7 +8,7 @@ import java.util.Date;
@Data
@TableName(value = "io_order_invoice")
public class IoOrderInvoiceResponse {
private Integer id;
private Long id;
/**
* 订单号外键

2
src/main/java/com/glxp/api/res/sync/SpsSyncOtherDataResponse.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.res.sync;
import com.glxp.api.entity.inout.IoCodeLostEntity;
import com.glxp.api.entity.inout.IoCodeRelEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import lombok.Data;
import java.util.List;
@ -12,4 +13,5 @@ public class SpsSyncOtherDataResponse extends BaseSyncResponse {
List<IoCodeLostEntity> ioCodeLostList;
List<IoCodeRelEntity> ioCodeRelList;
List<IoOrderInvoiceEntity> ioOrderInvoiceEntities;
}

1
src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java
Unescape Escape View File

@ -58,4 +58,5 @@ public class SyncDataSetResponse {
private int companyCert;
private int manufacturerCert;
private int productCert;
private int orderInvoice; //发票信息
}

3
src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
Unescape Escape View File

@ -255,7 +255,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
break;
case Constant.ORDER_ACTION_SUP_PREIN:
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2));
.gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
.eq("inStock", true));
default:
break;

3
src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.service.inout;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
@ -259,9 +260,9 @@ public class IoChangeInoutService {
if (CollUtil.isNotEmpty(invoiceEntities)) {
for (IoOrderInvoiceEntity orderInvoiceEntity : invoiceEntities) {
orderInvoiceEntity.setOrderIdFk(outOrder.getBillNo());
orderInvoiceEntity.setId(null);
orderInvoiceEntity.setBizIdFk(null);
orderInvoiceEntity.setUpdateTime(new Date());
orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
ioOrderInvoiceService.insertInvoice(orderInvoiceEntity);
}
}

8
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -720,6 +720,10 @@ public class IoCheckInoutService {
if (!bussinessTypeEntity.isThrCheckCopy()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
if (!bussinessTypeEntity.isThrCheckSp()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
}
}
} else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
@ -773,6 +777,10 @@ public class IoCheckInoutService {
if (!bussinessTypeEntity.isSecCheckCopy()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
if (!bussinessTypeEntity.isSecCheckSp()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
}
}
} else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);

6
src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java
Unescape Escape View File

@ -1,11 +1,13 @@
package com.glxp.api.service.inout;
import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.entity.inout.IoCodeRelEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.req.inout.IoOrderInvoiceRequest;
import java.util.List;
public interface IoOrderInvoiceService {
public interface IoOrderInvoiceService extends IService<IoOrderInvoiceEntity> {
List<IoOrderInvoiceEntity> findByBillNo(String billNo);
@ -16,7 +18,7 @@ public interface IoOrderInvoiceService {
boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest);
}

9
src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java
Unescape Escape View File

@ -1,7 +1,10 @@
package com.glxp.api.service.inout.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.inout.IoCodeRelMapper;
import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
import com.glxp.api.entity.inout.IoCodeRelEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.req.inout.IoOrderInvoiceRequest;
import org.springframework.beans.BeanUtils;
@ -16,7 +19,7 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper, IoOrderInvoiceEntity> implements IoOrderInvoiceService {
@Resource
IoOrderInvoiceMapper ioOrderInvoiceMapper;
@ -45,7 +48,7 @@ public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
}
@Override
public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceEntity);
public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceRequest);
}
}

8
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -672,9 +672,10 @@ public class IoOrderServiceImpl implements IoOrderService {
@Override
public void setInvoiceFiltes(FilterOrderRequest filterOrderRequest) {
// .eq("corpType", ConstantStatus.CORP_TYPE_OUT)
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("inStock", false)
.eq("mainAction", ConstantType.TYPE_PUT)
.eq("inStock", false)
.gt("spUse", 1).eq("actionType", 1).eq("enable", true));
List<String> actions1 = null;
actions1 = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
@ -682,7 +683,7 @@ public class IoOrderServiceImpl implements IoOrderService {
filterOrderRequest.setInvoiceActions1(actions1);
List<BasicBussinessTypeEntity> bussinessTypeEntities2 = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.eq("mainAction", ConstantType.TYPE_PUT)
.eq("inStock", true)
.gt("spUse", 0).eq("actionType", 1).eq("enable", true));
List<String> actions2 = null;
@ -691,6 +692,7 @@ public class IoOrderServiceImpl implements IoOrderService {
filterOrderRequest.setInvoiceActions2(actions2);
}
@Override
public List<IoOrderEntity> filterOrderTrace(String billNo) {
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));

3
src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java
Unescape Escape View File

@ -154,7 +154,8 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
response.setActionName(busType.getName());
//设置单据日期
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
if (order != null)
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
}
@Override

3
src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
Unescape Escape View File

@ -149,7 +149,8 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
response.setActionName(busType.getName());
//设置单据日期
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
if (order != null)
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
}
@Override

3
src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
Unescape Escape View File

@ -163,7 +163,8 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
response.setActionName(busType.getName());
//设置单据日期
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
if (order != null)
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
}

20
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -15,6 +15,7 @@ import com.glxp.api.constant.*;
import com.glxp.api.dao.basic.*;
import com.glxp.api.dao.inout.IoCodeLostMapper;
import com.glxp.api.dao.inout.IoCodeRelMapper;
import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
import com.glxp.api.dao.purchase.*;
import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao;
import com.glxp.api.dto.RelaySyncDto;
@ -1634,6 +1635,8 @@ public class HeartService {
private final IoCodeLostMapper ioCodeLostMapper;
private final IoCodeRelMapper ioCodeRelMapper;
@Resource
private final IoOrderInvoiceMapper ioOrderInvoiceMapper;
/**
* 设置嵌套事物
@ -1645,12 +1648,22 @@ public class HeartService {
cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content);
List<IoCodeLostEntity> ioCodeLostList = JSONUtil.toList(jsonObject.getJSONArray(IoCodeLostEntity.class.getSimpleName()), IoCodeLostEntity.class);
List<IoCodeRelEntity> ioCodeRelList = JSONUtil.toList(jsonObject.getJSONArray(IoCodeRelEntity.class.getSimpleName()), IoCodeRelEntity.class);
List<IoOrderInvoiceEntity> ioOrderInvoiceEntities = JSONUtil.toList(jsonObject.getJSONArray(IoOrderInvoiceEntity.class.getSimpleName()), IoOrderInvoiceEntity.class);
if (CollectionUtil.isNotEmpty(ioCodeLostList)) {
ioCodeLostMapper.insertOrUpdateBatch(ioCodeLostList);
}
if (CollectionUtil.isNotEmpty(ioCodeRelList)) {
ioCodeRelMapper.insertOrUpdateBatch(ioCodeRelList);
}
if (CollUtil.isNotEmpty(ioOrderInvoiceEntities)) {
ioOrderInvoiceMapper.insertOrUpdateBatch(ioOrderInvoiceEntities);
}
List<String> syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class);
if (CollUtil.isNotEmpty(syncFiles)) {
fileService.download(syncFiles);
}
}
@ -1798,6 +1811,11 @@ public class HeartService {
if (CollectionUtil.isNotEmpty(bean.getIoCodeRelList())) {
ioCodeRelMapper.insertOrUpdateBatch(bean.getIoCodeRelList());
}
// if (CollectionUtil.isNotEmpty(bean.getI())) {
// ioCodeRelMapper.insertOrUpdateBatch(bean.getIoCodeRelList());
// }
}
public void insetOrderDb(SpsSyncOrderResponse syncDataResponse, IoOrderEntity orderEntity) {
@ -1853,7 +1871,7 @@ public class HeartService {
List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
orderInvoiceEntity.setId(null);
orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
orderInvoiceService.insertInvoice(orderInvoiceEntity);
}
}

8
src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml
Unescape Escape View File

@ -10,11 +10,17 @@
#{expireDate})
</insert>
<select id="selectOrderInvoice" parameterType="com.glxp.api.entity.inout.IoOrderInvoiceEntity"
<select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
select *
from io_order_invoice
<where>
<if test="id != null">
AND id = #{id}
</if>
<if test="bizIdFk != null">
AND bizIdFk = #{bizIdFk}
</if>
<if test="orderIdFk != null and orderIdFk != ''">
AND orderIdFk = #{orderIdFk}
</if>

7
src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml
Unescape Escape View File

@ -9,15 +9,14 @@
</select>
<insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity">
<insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity" useGeneratedKeys="true">
insert INTO sync_data_bustypes
(`action`, `name`, outChange, orderStatus, direct)
(id, `action`, `name`, outChange, orderStatus, direct)
values
<foreach collection="syncDataBustypeEntities" item="item" index="index"
separator=",">
(#{item.action}, #{item.name},
(#{item.id}, #{item.action}, #{item.name},
#{item.outChange}, #{item.orderStatus}, #{item.direct})
</foreach>
</insert>

78
src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml
Unescape Escape View File

@ -12,45 +12,45 @@
<insert id="insert" parameterType="com.glxp.api.entity.system.SyncDataSetEntity">
replace
INTO sync_data_set( id, typeBus, typeScan,
typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp
, basicThirdInv
, basicThirdBusOrder, orderScanFinish, dbDiProducts, downstreamEnable, syncTime
, syncDownloadTime,
orderUnReceive, orderUnCheck, busTypes, sysUser, syncIp, orderSyncTime
, orderSyncStart, basicSyncStart, entrustAction
, unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept
, systemConfig
, printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig
, udiCodeLost, udiCodeRel)
INTO sync_data_set( id, typeBus, typeScan,
typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp
, basicThirdInv
, basicThirdBusOrder, orderScanFinish, dbDiProducts, downstreamEnable, syncTime
, syncDownloadTime,
orderUnReceive, orderUnCheck, busTypes, sysUser, syncIp, orderSyncTime
, orderSyncStart, basicSyncStart, entrustAction
, unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept
, systemConfig
, printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig
, udiCodeLost, udiCodeRel, orderInvoice)
values (#{id},
#{typeBus},
#{typeScan},
#{typeThird},
#{basicProducts},
#{basicCorp},
#{basicInv},
#{basicThirdProducts},
#{basicThirdCorp},
#{basicThirdInv},
#{basicThirdBusOrder},
#{orderScanFinish},
#{dbDiProducts},
#{downstreamEnable},
#{syncTime},
#{syncDownloadTime},
#{orderUnReceive},
#{orderUnCheck},
#{busTypes},
#{sysUser},
#{syncIp},
#{orderSyncTime},
#{orderSyncStart},
#{basicSyncStart},
#{entrustAction},
#{unCheckCert},
#{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept},
#{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig},
#{udiCodeLost}, #{udiCodeRel})
#{typeBus},
#{typeScan},
#{typeThird},
#{basicProducts},
#{basicCorp},
#{basicInv},
#{basicThirdProducts},
#{basicThirdCorp},
#{basicThirdInv},
#{basicThirdBusOrder},
#{orderScanFinish},
#{dbDiProducts},
#{downstreamEnable},
#{syncTime},
#{syncDownloadTime},
#{orderUnReceive},
#{orderUnCheck},
#{busTypes},
#{sysUser},
#{syncIp},
#{orderSyncTime},
#{orderSyncStart},
#{basicSyncStart},
#{entrustAction},
#{unCheckCert},
#{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept},
#{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig},
#{udiCodeLost}, #{udiCodeRel}, #{orderInvoice})
</insert>
</mapper>

2
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -391,3 +391,5 @@ CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);
CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);
CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);

Write Preview
Loading…
Cancel
Save