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

UDI码缺失补齐相关问题

Browse Source
master
anthonywj 2 years ago
parent 1d506f43ff
commit 28cef02d5d
8 changed files with 91 additions and 23 deletions
Show Stats Download Patch File Download Diff File

33
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -327,6 +327,9 @@ public class IoCodeTempController extends BaseController {
return null;
}
@Resource
IoCodeLostService codeLostService;
//前端扫码提交
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/addOrderWeb")
@ -386,21 +389,21 @@ public class IoCodeTempController extends BaseController {
BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
if (checkOriginCodeRes != null) {
// IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
// if (codeLostEntity == null) {
// if (StrUtil.isNotEmpty(orderId)) {
// List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
// IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
// if (ioCodeEnttity == null) {
// return checkOriginCodeRes;
// }
// } else
// return checkOriginCodeRes;
// } else {
// udiEntity.setBatchNo(codeLostEntity.getBatchNo());
// udiEntity.setExpireDate(codeLostEntity.getExpireDate());
// udiEntity.setProduceDate(codeLostEntity.getProduceDate());
// }
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
if (codeLostEntity == null) {
if (StrUtil.isNotEmpty(orderId)) {
List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
if (ioCodeEnttity == null) {
return checkOriginCodeRes;
}
} else
return checkOriginCodeRes;
} else {
udiEntity.setBatchNo(codeLostEntity.getBatchNo());
udiEntity.setExpireDate(codeLostEntity.getExpireDate());
udiEntity.setProduceDate(codeLostEntity.getProduceDate());
}
if (StrUtil.isNotEmpty(orderId)) {
List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);

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

@ -28,6 +28,7 @@ import com.glxp.api.service.inout.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@ -225,6 +226,9 @@ public class IoOrderController extends BaseController {
}
@Resource
IoCodeService codeService;

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

@ -1,9 +1,9 @@
package com.glxp.api.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inout.IoCodeLostEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface IoCodeLostMapper extends BaseMapper<IoCodeLostEntity> {
public interface IoCodeLostMapper extends BaseMapperPlus<IoCodeLostMapper, IoCodeLostEntity, IoCodeLostEntity> {
}

10
src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
Unescape Escape View File

@ -139,6 +139,16 @@ public class FilterOrderRequest extends ListPageRequest {
*/
private String statusType;
/**
* 送货管理界面： supDelivery
* 到货单管理界面： supArrival
* 退货单管理界面： supReturned
* 采购入库单界面： supPurchase
* 发票登记界面： supInvoice
*/
private String actionType;
private Integer orderType;
private Integer syncStatus;

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

@ -6,6 +6,7 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.inv.InvPreinDetailEntity;
import com.glxp.api.res.inout.IoOrderCheckResultResponse;
@ -16,6 +17,7 @@ import com.glxp.api.service.inv.InvPreinDetailService;
import com.glxp.api.service.inv.InvPreinOrderService;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -156,6 +158,49 @@ public class IoCheckInoutService {
}
}
@Resource
IoCodeLostService codeLostService;
@Async
public void genLostCode(String orderId) {
List<IoCodeEntity> ioCodeEntities = codeService.findByOrderId(orderId);
for (IoCodeEntity codeEntity : ioCodeEntities) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode());
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode());
if (codeLostEntity == null)
codeLostEntity = new IoCodeLostEntity();
//校验是否写入缺失表
boolean isTrue = false;
if (udiEntity != null) {
if (!StrUtil.trimToEmpty(codeEntity.getBatchNo()).equals(StrUtil.trimToEmpty(udiEntity.getBatchNo()))) {
if (StrUtil.isNotEmpty(codeEntity.getBatchNo())) {
codeLostEntity.setBatchNo(codeEntity.getBatchNo());
isTrue = true;
}
}
if (!StrUtil.trimToEmpty(codeEntity.getProduceDate()).equals(StrUtil.trimToEmpty(udiEntity.getProduceDate()))) {
if (StrUtil.isNotEmpty(codeEntity.getProduceDate())) {
codeLostEntity.setProduceDate(codeEntity.getProduceDate());
isTrue = true;
}
}
if (!StrUtil.trimToEmpty(codeEntity.getExpireDate()).equals(StrUtil.trimToEmpty(udiEntity.getExpireDate()))) {
if (StrUtil.isNotEmpty(codeEntity.getExpireDate())) {
codeLostEntity.setExpireDate(codeEntity.getExpireDate());
isTrue = true;
}
}
if (isTrue)
codeLostService.insertOrUpdate(codeLostEntity);
}
}
}
public String checkCode(IoCodeTempEntity codeEntity) {
boolean isBillExit = orderDetailBizService.isExit(codeEntity.getOrderId());
@ -229,6 +274,7 @@ public class IoCheckInoutService {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
genLostCode(orderEntity.getBillNo());
checkThird(orderEntity);
}
@ -333,7 +379,11 @@ public class IoCheckInoutService {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
//生成缺失码
genLostCode(orderEntity.getBillNo());
checkThird(orderEntity);
}
}

1
src/main/java/com/glxp/api/service/inout/IoCodeLostService.java
Unescape Escape View File

@ -8,6 +8,7 @@ public interface IoCodeLostService {
int insert(IoCodeLostEntity ioCodeLostEntity);
boolean insertOrUpdate(IoCodeLostEntity ioCodeLostEntity);
int deleteByCode(String code);

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

@ -24,9 +24,15 @@ public class IoCodeLostServiceImpl implements IoCodeLostService {
@Override
public int insert(IoCodeLostEntity ioCodeLostEntity) {
return codeLostEntityMapper.insert(ioCodeLostEntity);
}
@Override
public boolean insertOrUpdate(IoCodeLostEntity ioCodeLostEntity) {
return codeLostEntityMapper.insertOrUpdate(ioCodeLostEntity);
}
@Override
public int deleteByCode(String code) {
return codeLostEntityMapper.delete(new QueryWrapper<IoCodeLostEntity>().eq("code", code));

6
src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
Unescape Escape View File

@ -123,12 +123,6 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if>
<if test="startTime != null and startTime != '' and (endTime == null or endTime == '')">
AND date_format(createTime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d')
</if>
<if test="endTime != null and endTime != '' and (startTime == null or startTime == '')">
AND date_format(createTime, '%Y-%m-%d') &lt;= date_format(#{endTime}, '%Y-%m-%d')
</if>
</where>
order by createTime desc
</select>

Write Preview
Loading…
Cancel
Save