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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
anthonywj 2 years ago
parent 5e9d092264 43a067bc4b
commit 8d0b2d27cf
5 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File

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

@ -43,6 +43,7 @@ import com.glxp.api.util.OrderNoTypeBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Async;
@ -798,6 +799,10 @@ public class IoOrderController extends BaseController {
List<IoOrderInvoiceEntity> ioOrderInvoiceEntity = orderInvoiceService.list(ew);
List<String> orderIds = ioOrderInvoiceEntity.stream().map(IoOrderInvoiceEntity::getOrderIdFk).collect(Collectors.toList());
filterOrderRequest.setOrderIds(orderIds);
if(CollectionUtils.isEmpty(orderIds)){
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>();
return ResultVOUtils.page(pageInfo);
}
}

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

@ -27,6 +27,7 @@ import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderDetailCodeService;
import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -193,4 +194,20 @@ public class IoOrderInvoiceController {
else
return ResultVOUtils.error(500, "删除失败！");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/invoice/checkInvoiceCode")
public BaseResponse checkInvoiceCode(@RequestBody DeleteRequest deleteRequest) {
if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode()))
return ResultVOUtils.error(500, "发票编码不能为空");
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()));
if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size()>0){
return ResultVOUtils.error(999,"发票编码已存在！");
}
return ResultVOUtils.success();
}
}

63
src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java
Unescape Escape View File

@ -80,7 +80,7 @@ public class IoOrderUtilsService {
ioCodeTempEntity1.setRelId(null);
checkUdi = true;
} else {
if(CollectionUtil.isNotEmpty(udiRlSupEntityList)) {
if (CollectionUtil.isNotEmpty(udiRlSupEntityList)) {
ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId());
map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0));
}
@ -110,41 +110,44 @@ public class IoOrderUtilsService {
//扫码单据生成
IoOrderDetailCodeEntity ioOrderDetailCodeEntity1 = new IoOrderDetailCodeEntity();
List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntities = new ArrayList<>();
for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : ioOrderDetailCodeEntityList) {
ioOrderDetailCodeEntity1.setOrderIdFk(billNO);
if (CollectionUtil.isNotEmpty(ioOrderDetailCodeEntityList)) {
for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : ioOrderDetailCodeEntityList) {
ioOrderDetailCodeEntity1.setOrderIdFk(billNO);
ioOrderUploadRequest udiRlSupEntity = map.get(ioOrderDetailCodeEntity.getBindRlFk());
if (udiRlSupEntity != null) {
ioOrderDetailCodeEntity1.setBindRlFk(udiRlSupEntity.getId());
ioOrderDetailCodeEntity1.setUuidFk(udiRlSupEntity.getUdiRlIdFk() + "");
} else {
ioOrderDetailCodeEntity1.setBindRlFk(null);
ioOrderDetailCodeEntity1.setUuidFk(null);
ioOrderUploadRequest udiRlSupEntity = map.get(ioOrderDetailCodeEntity.getBindRlFk());
if (udiRlSupEntity != null) {
ioOrderDetailCodeEntity1.setBindRlFk(udiRlSupEntity.getId());
ioOrderDetailCodeEntity1.setUuidFk(udiRlSupEntity.getUdiRlIdFk() + "");
} else {
ioOrderDetailCodeEntity1.setBindRlFk(null);
ioOrderDetailCodeEntity1.setUuidFk(null);
}
ioOrderDetailCodeEntity1.setId(IdUtil.getSnowflakeNextId());
ioOrderDetailCodeEntity1.setNameCode(ioOrderDetailCodeEntity.getNameCode());
ioOrderDetailCodeEntity1.setBatchNo(ioOrderDetailCodeEntity.getBatchNo());
ioOrderDetailCodeEntity1.setProductDate(ioOrderDetailCodeEntity.getProductDate());
ioOrderDetailCodeEntity1.setExpireDate(ioOrderDetailCodeEntity.getExpireDate());
ioOrderDetailCodeEntity1.setCoName(ioOrderDetailCodeEntity.getCoName());
ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode());
ioOrderDetailCodeEntity1.setYlqxzcrbarmc(ioOrderDetailCodeEntity.getYlqxzcrbarmc());
ioOrderDetailCodeEntity1.setManufacturer(ioOrderDetailCodeEntity.getManufacturer());
ioOrderDetailCodeEntity1.setMeasname(ioOrderDetailCodeEntity.getMeasname());
ioOrderDetailCodeEntity1.setPrice(ioOrderDetailCodeEntity.getPrice());
ioOrderDetailCodeEntity1.setSpec(ioOrderDetailCodeEntity.getSpec());
ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode());
ioOrderDetailCodeEntity1.setSupId(ioOrderDetailCodeEntity.getSupId());
ioOrderDetailCodeEntity1.setBindSupStatus(ioOrderDetailCodeEntity.getBindSupStatus());
ioOrderDetailCodeEntity1.setCount(ioOrderDetailCodeEntity.getCount());
ioOrderDetailCodeEntity1.setReCount(ioOrderDetailCodeEntity.getReCount());
ioOrderDetailCodeEntity1.setUpdateTime(new Date());
ioOrderDetailCodeEntities.add(ioOrderDetailCodeEntity1);
}
ioOrderDetailCodeEntity1.setId(IdUtil.getSnowflakeNextId());
ioOrderDetailCodeEntity1.setNameCode(ioOrderDetailCodeEntity.getNameCode());
ioOrderDetailCodeEntity1.setBatchNo(ioOrderDetailCodeEntity.getBatchNo());
ioOrderDetailCodeEntity1.setProductDate(ioOrderDetailCodeEntity.getProductDate());
ioOrderDetailCodeEntity1.setExpireDate(ioOrderDetailCodeEntity.getExpireDate());
ioOrderDetailCodeEntity1.setCoName(ioOrderDetailCodeEntity.getCoName());
ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode());
ioOrderDetailCodeEntity1.setYlqxzcrbarmc(ioOrderDetailCodeEntity.getYlqxzcrbarmc());
ioOrderDetailCodeEntity1.setManufacturer(ioOrderDetailCodeEntity.getManufacturer());
ioOrderDetailCodeEntity1.setMeasname(ioOrderDetailCodeEntity.getMeasname());
ioOrderDetailCodeEntity1.setPrice(ioOrderDetailCodeEntity.getPrice());
ioOrderDetailCodeEntity1.setSpec(ioOrderDetailCodeEntity.getSpec());
ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode());
ioOrderDetailCodeEntity1.setSupId(ioOrderDetailCodeEntity.getSupId());
ioOrderDetailCodeEntity1.setBindSupStatus(ioOrderDetailCodeEntity.getBindSupStatus());
ioOrderDetailCodeEntity1.setCount(ioOrderDetailCodeEntity.getCount());
ioOrderDetailCodeEntity1.setReCount(ioOrderDetailCodeEntity.getReCount());
ioOrderDetailCodeEntity1.setUpdateTime(new Date());
ioOrderDetailCodeEntities.add(ioOrderDetailCodeEntity1);
}
//业务单生成
List<IoOrderDetailBizEntity> ioOrderDetailBizEntities = new ArrayList<>();
if (ioOrderDetailBizEntityList != null && ioOrderDetailBizEntityList.size() > 0) {
if (CollectionUtil.isNotEmpty(ioOrderDetailBizEntityList)) {
for (IoOrderDetailBizEntity ioOrderDetailBizEntity : ioOrderDetailBizEntityList) {
IoOrderDetailBizEntity ioOrderDetailBizEntity1 = new IoOrderDetailBizEntity();
ioOrderDetailBizEntity1.setOrderIdFk(billNO);

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

@ -87,6 +87,9 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
}
}
orderResponse.setAllAmount(amount);
if(StrUtil.isBlank(orderResponse.getCheckStatus())){
orderResponse.setCheckStatus("0");
}
} else
return orderResponse;

3
src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
Unescape Escape View File

@ -411,7 +411,8 @@
auth_warehouse.name,
auth_warehouse.parentId,
auth_warehouse.parentCode,
auth_dept.name warehouseName,
auth_dept.name deptName,
auth_dept.code deptCode,
auth_warehouse.advanceType
from auth_warehouse
inner join auth_dept on auth_warehouse.parentId = auth_dept.code

Write Preview
Loading…
Cancel
Save