|
|
|
|
@ -1,47 +1,47 @@
|
|
|
|
|
package com.glxp.api.admin.controller.inout;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
|
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
|
|
|
|
|
import com.glxp.api.admin.constant.Constant;
|
|
|
|
|
import com.glxp.api.admin.constant.ConstantStatus;
|
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
|
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.DataTransUtil;
|
|
|
|
|
import com.glxp.api.admin.controller.inout.utils.InoutUtils;
|
|
|
|
|
import com.glxp.api.admin.dao.business.StockOrderDao;
|
|
|
|
|
import com.glxp.api.admin.dao.inout.CodesDao;
|
|
|
|
|
import com.glxp.api.admin.dao.inout.CodesTempDao;
|
|
|
|
|
import com.glxp.api.admin.dao.inout.OrderDao;
|
|
|
|
|
import com.glxp.api.admin.dao.inventory.InvWarehouseDao;
|
|
|
|
|
import com.glxp.api.admin.entity.auth.AuthAdmin;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.EntrustReceEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.UdiEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.business.StockOrderEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.info.CompanyEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.inout.*;
|
|
|
|
|
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
|
|
|
|
|
import com.glxp.api.admin.httpclient.ErpOrderClient;
|
|
|
|
|
import com.glxp.api.admin.httpclient.SpsDirectClient;
|
|
|
|
|
import com.glxp.api.admin.req.basic.BasicEntrustRecRequest;
|
|
|
|
|
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
|
|
|
|
|
import com.glxp.api.admin.req.inout.*;
|
|
|
|
|
import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
|
|
|
|
|
import com.glxp.api.admin.res.PageSimpleResponse;
|
|
|
|
|
import com.glxp.api.admin.res.basic.BussinessTypResponse;
|
|
|
|
|
import com.glxp.api.admin.service.auth.CustomerService;
|
|
|
|
|
import com.glxp.api.admin.service.basic.BussinessTypeService;
|
|
|
|
|
import com.glxp.api.admin.service.basic.UdiInfoService;
|
|
|
|
|
import com.glxp.api.admin.service.basic.UdiRelevanceService;
|
|
|
|
|
import com.glxp.api.admin.service.basic.EntrustReceService;
|
|
|
|
|
import com.glxp.api.admin.service.business.StockOrderService;
|
|
|
|
|
import com.glxp.api.admin.service.info.CompanyService;
|
|
|
|
|
import com.glxp.api.admin.service.info.SystemParamConfigService;
|
|
|
|
|
import com.glxp.api.admin.service.inout.*;
|
|
|
|
|
import com.glxp.api.admin.service.inventory.InvWarehouseService;
|
|
|
|
|
import com.glxp.api.admin.service.thrsys.ThrOrderService;
|
|
|
|
|
import com.glxp.api.admin.thread.InvProductsTrService;
|
|
|
|
|
import com.glxp.api.admin.thread.IoTransInoutService;
|
|
|
|
|
import com.glxp.api.admin.util.CustomUtil;
|
|
|
|
|
import com.glxp.api.admin.util.FilterUdiUtils;
|
|
|
|
|
import com.glxp.api.admin.util.*;
|
|
|
|
|
import com.glxp.api.common.enums.ResultEnum;
|
|
|
|
|
import com.glxp.api.common.res.BaseResponse;
|
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
@ -81,9 +81,23 @@ public class OrderController {
|
|
|
|
|
InvWarehouseService invWarehouseService;
|
|
|
|
|
@Resource
|
|
|
|
|
WarehouseUserService warehouseUserService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
CustomerService customerService;
|
|
|
|
|
@Resource
|
|
|
|
|
EntrustReceService entrustReceService;
|
|
|
|
|
@Resource
|
|
|
|
|
GennerOrderUtils gennerOrderUtils;
|
|
|
|
|
@Resource
|
|
|
|
|
InvWarehouseDao invWarehouseDao;
|
|
|
|
|
@Resource
|
|
|
|
|
OrderDao orderDao;
|
|
|
|
|
@Resource
|
|
|
|
|
CodesTempDao codesTempDao;
|
|
|
|
|
@Resource
|
|
|
|
|
SpsDirectClient spsDirectClient;
|
|
|
|
|
@Resource
|
|
|
|
|
SystemParamConfigService systemParamConfigService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("udiwms/inout/order/getUdi")
|
|
|
|
|
@ -140,14 +154,18 @@ public class OrderController {
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("udiwms/inout/order/delete")
|
|
|
|
|
public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
String id = deleteRequest.getId();
|
|
|
|
|
if (StrUtil.isBlank(deleteRequest.getId()) && CollUtil.isEmpty(deleteRequest.getIds())) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
}
|
|
|
|
|
if (CollUtil.isNotEmpty(deleteRequest.getIds())) {
|
|
|
|
|
orderService.deleteOrders(deleteRequest.getIds());
|
|
|
|
|
} else {
|
|
|
|
|
orderService.deleteOrders(Collections.singletonList(deleteRequest.getId()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
orderService.deleteById(id);
|
|
|
|
|
orderDetailService.deleteByOrderId(id);
|
|
|
|
|
return ResultVOUtils.success("删除成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -230,12 +248,43 @@ public class OrderController {
|
|
|
|
|
|
|
|
|
|
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction());
|
|
|
|
|
StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId());
|
|
|
|
|
|
|
|
|
|
if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_review_order");
|
|
|
|
|
if (systemParamConfigEntity.getParamValue().equals("1")) {
|
|
|
|
|
BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction());
|
|
|
|
|
return baseResponse;
|
|
|
|
|
} else
|
|
|
|
|
return ResultVOUtils.error(500, "单据未找到！");
|
|
|
|
|
} else if (!bussinessTypeEntity.getLocalAction().equals(stockOrderEntity.getBillType())) {
|
|
|
|
|
return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！");
|
|
|
|
|
} else if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) {
|
|
|
|
|
if (StrUtil.isNotEmpty(stockOrderEntity.getLocStorageCode())) {
|
|
|
|
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderEntity.getLocStorageCode());
|
|
|
|
|
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
|
|
|
|
|
filterInvUserRequest.setCode(invWarehouseEntity.getCode());
|
|
|
|
|
filterInvUserRequest.setUserid(userId.longValue());
|
|
|
|
|
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
|
|
|
|
|
List<EntrustReceEntity> entrustReceEntities = null;
|
|
|
|
|
if (!stockOrderEntity.isEntrustEnd()) {
|
|
|
|
|
BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest();
|
|
|
|
|
basicEntrustRecRequest.setAction(stockOrderEntity.getBillType());
|
|
|
|
|
basicEntrustRecRequest.setEntrustUser(userId + "");
|
|
|
|
|
basicEntrustRecRequest.setCurInv(stockOrderEntity.getLocStorageCode());
|
|
|
|
|
entrustReceEntities = entrustReceService.filterEntrustRec(basicEntrustRecRequest);
|
|
|
|
|
} else {
|
|
|
|
|
return ResultVOUtils.error(500, "单据已委托验收完成！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(warehouseUserEntities) && CollUtil.isEmpty(entrustReceEntities)) {
|
|
|
|
|
return ResultVOUtils.error(500, "权限不足，无法验收！");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
orderFilterRequest.setId(stockOrderEntity.getOrderIdFk());
|
|
|
|
|
return ResultVOUtils.error(500, "非未验收单据！");
|
|
|
|
|
}
|
|
|
|
|
if (orderFilterRequest.getOrderId() == null || "".equals(orderFilterRequest.getOrderId())) {
|
|
|
|
|
orderFilterRequest.setId(null);
|
|
|
|
|
@ -244,8 +293,9 @@ public class OrderController {
|
|
|
|
|
if (orderEntity.getReceiveStatus() == ConstantStatus.RECEIVE_ED) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据已验收！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<OrderEntity> orderEntityList;
|
|
|
|
|
if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
|
|
|
|
|
orderFilterRequest.setStatus(4);
|
|
|
|
|
@ -270,14 +320,113 @@ public class OrderController {
|
|
|
|
|
public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
|
|
|
|
|
BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
AuthAdmin authAdmin = customerService.getUserBean();
|
|
|
|
|
OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId());
|
|
|
|
|
|
|
|
|
|
if (orderEntity == null) {
|
|
|
|
|
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
|
|
|
|
|
orderFilterRequest.setOrderId(updateExportStatusRequest.getOrderId());
|
|
|
|
|
orderFilterRequest.setWmsUserId(authAdmin.getId() + "");
|
|
|
|
|
return spsDirectClient.reviewOrder(orderFilterRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (orderEntity.getReceiveStatus() == ConstantStatus.RECEIVE_ED) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据已验收！");
|
|
|
|
|
}
|
|
|
|
|
if (updateExportStatusRequest.isEntrust() && updateExportStatusRequest.getEntrustId() != null) {
|
|
|
|
|
EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId());
|
|
|
|
|
if (entrustReceEntity == null) {
|
|
|
|
|
return ResultVOUtils.error(500, "无验收权限！");
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
|
|
|
|
|
transferOrder(orderEntity, entrustReceEntity);
|
|
|
|
|
}
|
|
|
|
|
if (!entrustReceEntity.isFinishRece()) {
|
|
|
|
|
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
|
|
|
|
|
stockOrderFilterRequest.setOrderIdFk(updateExportStatusRequest.getOrderId());
|
|
|
|
|
List<StockOrderEntity> stockOrderEntityLit = stockOrderService.findAllOrders(stockOrderFilterRequest);
|
|
|
|
|
if (!stockOrderEntityLit.isEmpty()) {
|
|
|
|
|
for (StockOrderEntity stockOrderEntity : stockOrderEntityLit) {
|
|
|
|
|
stockOrderEntity.setEntrustEnd(true);
|
|
|
|
|
stockOrderService.updateById(stockOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.success("验收成功！");
|
|
|
|
|
} else
|
|
|
|
|
|
|
|
|
|
return updateReview(authAdmin, updateExportStatusRequest);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else
|
|
|
|
|
return updateReview(authAdmin, updateExportStatusRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void transferOrder(OrderEntity orderEntity, EntrustReceEntity entrustReceEntity) {
|
|
|
|
|
List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
|
|
|
|
|
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(entrustReceEntity.getEntrustAction());
|
|
|
|
|
OrderEntity supplementOrder = new OrderEntity();
|
|
|
|
|
BeanUtil.copyProperties(orderEntity, supplementOrder);
|
|
|
|
|
//生成补单单号
|
|
|
|
|
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
|
|
|
|
|
String supplementOrderNo = orderNo;
|
|
|
|
|
supplementOrder.setOriginUllageSupNo(orderEntity.getId());
|
|
|
|
|
supplementOrder.setId(supplementOrderNo);
|
|
|
|
|
supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
supplementOrder.setExportStatus(0); //设置导出状态为未导出
|
|
|
|
|
supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验
|
|
|
|
|
supplementOrder.setReceiveStatus(0); //设置验收状态为未验收
|
|
|
|
|
supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
|
|
|
|
|
//修改往来单位及当前库存号
|
|
|
|
|
supplementOrder.setFromCorpId(orderEntity.getLocStorageCode());
|
|
|
|
|
supplementOrder.setLocStorageCode(orderEntity.getFromCorpId());
|
|
|
|
|
String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
|
|
|
|
|
supplementOrder.setFromCorp(name);
|
|
|
|
|
supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE);
|
|
|
|
|
|
|
|
|
|
supplementOrder.setMainAction(bussinessTypeEntity.getMainAction());
|
|
|
|
|
supplementOrder.setAction(bussinessTypeEntity.getAction());
|
|
|
|
|
supplementOrder.setErpFk(null);
|
|
|
|
|
//复制码表
|
|
|
|
|
List<WarehouseEntity> supplementCodes = new ArrayList<>();
|
|
|
|
|
warehouseEntities.forEach(
|
|
|
|
|
code -> {
|
|
|
|
|
WarehouseEntity supplementCode = new WarehouseEntity();
|
|
|
|
|
BeanUtil.copyProperties(code, supplementCode);
|
|
|
|
|
supplementCode.setFromCorpId(supplementOrder.getFromCorpId());
|
|
|
|
|
supplementCode.setFromCorp(supplementOrder.getFromCorp());
|
|
|
|
|
supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode());
|
|
|
|
|
supplementCode.setOrderId(supplementOrderNo);
|
|
|
|
|
//查询补单设置
|
|
|
|
|
supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType());
|
|
|
|
|
supplementCode.setMainAction(bussinessTypeEntity.getMainAction());
|
|
|
|
|
supplementCode.setId(null);
|
|
|
|
|
supplementCodes.add(supplementCode);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
//更新数据
|
|
|
|
|
try {
|
|
|
|
|
orderDao.insertOrder(supplementOrder);
|
|
|
|
|
orderEntity.setUllageSupNo(supplementOrder.getId());
|
|
|
|
|
orderDao.updateOrder(orderEntity);
|
|
|
|
|
codesTempDao.insertCodesTemp(supplementCodes);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public BaseResponse updateReview(AuthAdmin authAdmin, UpdateExportStatusRequest updateExportStatusRequest) {
|
|
|
|
|
OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId());
|
|
|
|
|
orderEntity.setReceiveStatus(1);
|
|
|
|
|
orderEntity.setReviewUser(authAdmin.getId().intValue());
|
|
|
|
|
orderEntity.setUpdateTime(new Date());
|
|
|
|
|
orderEntity.setAuditTime(new Date());
|
|
|
|
|
orderService.updateOrder(orderEntity);
|
|
|
|
|
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
|
|
|
|
|
if (erpIds != null && erpIds.size() > 0) {
|
|
|
|
|
@ -287,8 +436,9 @@ public class OrderController {
|
|
|
|
|
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
|
|
|
|
|
stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
|
|
|
|
|
stockOrderEntity.setReviewUser(authAdmin.getId().intValue());
|
|
|
|
|
stockOrderEntity.setAuditTime(new Date());
|
|
|
|
|
stockOrderEntity.setEntrustEnd(true);
|
|
|
|
|
stockOrderService.updateById(stockOrderEntity);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
|
|
|
|
|
@ -298,16 +448,36 @@ public class OrderController {
|
|
|
|
|
for (StockOrderEntity stockOrderEntity : stockOrderEntityLit) {
|
|
|
|
|
stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
|
|
|
|
|
stockOrderEntity.setReviewUser(authAdmin.getId().intValue());
|
|
|
|
|
stockOrderEntity.setAuditTime(new Date());
|
|
|
|
|
stockOrderService.updateById(stockOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
invProductsTrService.genInvProducts(orderEntity.getId());
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success("更新成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//前端直接验收完成
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("/spms/inout/order/web/updateStatus")
|
|
|
|
|
public BaseResponse webUpdateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
|
|
|
|
|
BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
StockOrderEntity temp = stockOrderService.findByBillNo(updateExportStatusRequest.getStockOrderId());
|
|
|
|
|
if (temp == null) {
|
|
|
|
|
return ResultVOUtils.error(500, "未找到该业务单据");
|
|
|
|
|
}
|
|
|
|
|
updateExportStatusRequest.setOrderId(temp.getOrderIdFk());
|
|
|
|
|
|
|
|
|
|
AuthAdmin authAdmin = customerService.getUserBean();
|
|
|
|
|
return updateReview(authAdmin, updateExportStatusRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/inout/order/filterCode")
|
|
|
|
|
public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest,
|
|
|
|
|
@ -513,4 +683,34 @@ public class OrderController {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询单据删除页面数据
|
|
|
|
|
*
|
|
|
|
|
* @param billNo
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/inout/order/filterOrderForDelete")
|
|
|
|
|
public BaseResponse filterOrderForDelete(String billNo) {
|
|
|
|
|
if (StrUtil.isBlank(billNo)) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
}
|
|
|
|
|
List<OrderEntity> orderEntities = orderService.filterOrderForDelete(billNo);
|
|
|
|
|
PageInfo<OrderEntity> pageInfo = new PageInfo<>(orderEntities);
|
|
|
|
|
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(orderEntities);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("/udiwms/inout/order/updateOrderInfo")
|
|
|
|
|
public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) {
|
|
|
|
|
if (null == orderEditRequest || StrUtil.isBlank(orderEditRequest.getActDate()) || CollUtil.isEmpty(orderEditRequest.getOrderIds())) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
|
|
|
|
|
}
|
|
|
|
|
orderService.updateOrderInfo(orderEditRequest.getActDate(), orderEditRequest.getAuditTime(), orderEditRequest.getOrderIds());
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
