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

扫码查询单据明细

Browse Source
dev_fifo_z
yewj 6 months ago
parent aa4fbf93eb
commit 26a2fabaa5
4 changed files with 60 additions and 17 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
Unescape Escape View File

@ -315,9 +315,9 @@ public class SysWorkplaceQueueController extends BaseController {
public BaseResponse reloadBindingLed(@RequestBody SysWorkplaceQueue sysWorkplaceQueue) {
SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getMac, sysWorkplaceQueue.getMac()));
if (queue != null){
if (queue != null) {
//提示已经被绑定是否需要更改到当前槽位
return ResultVOUtils.error(503,"该灯组已绑定在" + queue.getCode() + "槽位");
return ResultVOUtils.error(503, "该灯组已绑定在" + queue.getCode() + "槽位");
}
//绑定
sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
@ -335,11 +335,11 @@ public class SysWorkplaceQueueController extends BaseController {
}
IoCollectLedGroup ledGroupServiceOne = ioCollectLedGroupService.getOne(new LambdaQueryWrapper<IoCollectLedGroup>().eq(IoCollectLedGroup::getMac, macCode));
if (ledGroupServiceOne == null){
return ResultVOUtils.error(500,"当前灯组标签不存在");
if (ledGroupServiceOne == null) {
return ResultVOUtils.error(500, "当前灯组标签不存在");
}
SysWorkplaceQueue queue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getMac, macCode));
if (queue != null && !queue.getCode().equals(request.getCode())){
if (queue != null && !queue.getCode().equals(request.getCode())) {
}
return ResultVOUtils.success(ledGroupServiceOne);

38
src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
Unescape Escape View File

@ -18,6 +18,7 @@ import com.glxp.api.constant.WorkOperType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.BasicSkPrescribeEntity;
import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.collect.*;
import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity;
import com.glxp.api.entity.inout.ExcelVO;
@ -29,12 +30,14 @@ import com.glxp.api.req.collect.*;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UserWorkResponse;
import com.glxp.api.res.collect.CollectOrderBizResponse;
import com.glxp.api.res.collect.ConfirmResponse;
import com.glxp.api.res.collect.IoCollectOrderResponse;
import com.glxp.api.service.basic.BasicCollectUserService;
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.collect.*;
import com.glxp.api.service.inout.ExcelService;
import com.glxp.api.service.inout.IoSplitCodeService;
@ -42,6 +45,7 @@ import com.glxp.api.util.Excel.ExcelHandler;
import com.glxp.api.util.Excel.Exception.RenException;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@ -237,6 +241,40 @@ public class IoCollectOrderController extends BaseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@Resource
UdiRelevanceService udiRelevanceService;
/**
* 扫码查询单据明细
*
* @param collectOrderBizRequest
* @return
*/
@GetMapping("/udiwms/basic/collect/order/detailByCode")
public BaseResponse detailByCode(CollectOrderBizRequest collectOrderBizRequest) {
if (StrUtil.isBlank(collectOrderBizRequest.getOrderIdFk())) {
return ResultVOUtils.error(500, "单据号不能为空");
}
IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderBizRequest.getOrderIdFk());
if (collectOrder == null) {
return ResultVOUtils.error(500, "未找到单据");
}
UdiEntity udiEntity = FilterUdiUtils.getUdi(collectOrderBizRequest.getUdiCode());
if (udiEntity == null) {
return ResultVOUtils.error(500, "无效追溯码！");
}
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
collectOrderBizRequest.setRelId(udiRelevanceResponse.getId());
List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<CollectOrderBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(list);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/basic/collect/order/allDetail")
public BaseResponse allDetail(CollectOrderBizRequest collectOrderBizRequest) {

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

@ -170,9 +170,9 @@ public class IoOrderDetailBizController extends BaseController {
orderEntity.setDeptCode(invWarehouseEntity.getParentId());
orderEntity.setInvCode(orderEntity.getInvCode());
orderEntity.setBusType(bussinessTypeEntity.getBusType());
if (addBizProductReqeust.getProductType() == null){
if (addBizProductReqeust.getProductType() == null) {
orderEntity.setProductType(1);
}else {
} else {
orderEntity.setProductType(addBizProductReqeust.getProductType());
}
@ -684,7 +684,7 @@ public class IoOrderDetailBizController extends BaseController {
filterOrderRequest.setEndTime(endTime);
filterOrderRequest.setBillNo(billNo);
List<IoOrderResponse> ioOrderResponses = orderService.getfilterOrderList(filterOrderRequest);
if (CollUtil.isEmpty(ioOrderResponses)){
if (CollUtil.isEmpty(ioOrderResponses)) {
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(ioOrderResponses);
return ResultVOUtils.page(pageInfo);
}
@ -692,7 +692,6 @@ public class IoOrderDetailBizController extends BaseController {
orderDetailBizRequest.setOrderIdFks(orders);
orderDetailBizRequest.setLimit(finishBizRequest.getLimit());
orderDetailBizRequest.setPage(finishBizRequest.getPage());
orderDetailBizRequest.setKeyWords(finishBizRequest.getKeyWords());
@ -704,7 +703,7 @@ public class IoOrderDetailBizController extends BaseController {
.sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode))
.collect(Collectors.toList());
}
if (CollUtil.isEmpty(list)){
if (CollUtil.isEmpty(list)) {
PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
@ -904,7 +903,7 @@ public class IoOrderDetailBizController extends BaseController {
for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()))
&& StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
if (StrUtil.isNotEmpty(orderInvoiceEntity.getPrice())){
if (StrUtil.isNotEmpty(orderInvoiceEntity.getPrice())) {
BigDecimal price = new BigDecimal(orderInvoiceEntity.getPrice());
invoiceAmount = invoiceAmount.add(price);
}
@ -935,6 +934,7 @@ public class IoOrderDetailBizController extends BaseController {
/**
* 获取上货记录
*
* @param orderDetailBizRequest
* @param bindingResult
* @return
@ -954,3 +954,6 @@ public class IoOrderDetailBizController extends BaseController {
}
}

2
src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java
Unescape Escape View File

@ -122,4 +122,6 @@ public class CollectOrderBizRequest extends ListPageRequest {
* 组套编码/医保编码/术士套包编码
*/
private String checkCode;
private String udiCode;
}

Write Preview
Loading…
Cancel
Save