Skip to content

J
jyzb_platformV2
Commit a4766f69 by 李小惠
Options

修改测试的所有bug

parent 51d8b982
正在显示 包含 414 行增加 和 288 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventoryDto.java
......@@ -131,24 +131,5 @@ public class InventoryDto implements Serializable {
private String note ;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建时间
*/
private String updateUser;
/**
* 更新时间
*/
private String createUser;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java
......@@ -3,42 +3,25 @@ package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class OrderDetailDto implements Serializable {
private Long id;
private String typeId;
private String orderId;
private String typeName;
private String type;
private Long sizeId;
private String equipmentType;
private String sizeName;
private String equipmentTypeName;
private String supplierId;
private Long equipmentSize;
private String supplierName;
private String equipmentSizeName;
private Integer planNum;
private Long equipment_supplier;
private String equipmentSupplierName;
private String planNum;
private String actualNum;
private String price;
private String orderType;
private Date createTime;
private Date updateTime;
private String createUser;
private String updateUser;
private BigDecimal price;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDto.java
......@@ -3,15 +3,12 @@ package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
@Data
public class OrderDto implements Serializable {
private String id;
private String examineState;
private String processType;
/**
* 单据类型：入库单/出库单
*/
......@@ -63,16 +60,12 @@ public class OrderDto implements Serializable {
/**
* 总价格
*/
private String price;
private BigDecimal price;
/**
* 应入库数量
*/
private String inventoryQuantity;
/**
* 附件地址
*/
private String attachmentLocation;
/**
* 单据包含的物资集合
*/
private String invList;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderMainDto.java
......@@ -35,33 +35,16 @@ public class OrderMainDto implements Serializable {
private String endOrgUserName;
private String examineState;
private BigDecimal price;
private Integer inventoryQuantity;
private Integer actualQuantity;
private Integer manualState;
private Integer orderState;
private String attachmentLocation;
private String invList;
/**
* 创建时间
*/
private Date createTime;
private Date returnData;
/**
* 更新时间
*/
private Date updateTime;
private Date useDate;
private String createUser;
private String note;
private String updateUser;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventoryReq.java
......@@ -60,6 +60,7 @@ public class InventoryReq extends BaseRequest {
/**
* 货架位置
*/
@NotBlank(message = "货架id不能为空",groups = {list.class})
private String shelfId;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventorySumReq.java
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class InventorySumReq {
public class InventorySumReq extends BaseRequest {
/**
* 批次主键
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderDetailReq.java
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
@Data
......@@ -20,23 +19,23 @@ public class OrderDetailReq extends BaseRequest {
private String type;
private String equipmentType;
private String typeId;
private String equipmentTypeName;
private String typeName;
private Long equipmentSize;
private Long sizeId;
private String equipmentSizeName;
private String sizeName;
private Long equipment_supplier;
private String supplierId;
private String equipmentSupplierName;
private String supplierName;
private String planNum;
private Integer planNum;
private String actualNum;
private Integer actualNum;
private String price;
private BigDecimal price;
private String orderType;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java
......@@ -58,7 +58,7 @@ public class OrderMainReq extends BaseRequest {
/**
* 组织机构id
*/
@NotNull(message = "组织机构不能为空",groups = {edit.class})
@NotNull(message = "组织机构不能为空",groups = {edit.class, add.class})
private Long orgId;
/**
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/DetailListReq.java
......@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.req;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
@Data
public class DetailListReq implements Serializable {
......@@ -17,24 +18,24 @@ public class DetailListReq implements Serializable {
/**
* 类型id
*/
private String equipmentType;
private String typeId;
/**
* 类型名称
*/
private String equipmentTypeName;
private String typeName;
/**
* 号型
*/
private String equipmentSize;
private String sizeId;
private String equipmentSizeName;
private String sizeName;
private Long equipmentSupplier;
private String supplierId;
private String equipmentSupplierName;
private String supplierName;
private String planNum;
private Integer planNum;
private String price;
private BigDecimal price;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
......@@ -14,11 +14,10 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class UpdateOrderReq extends BaseRequest implements Serializable {
@NotBlank(message = "id不能为空",groups = {edit.class})
private String Id;
private String id;
private String examineState;
private String processType;
/**
* 单据类型：入库单/出库单
*/
......@@ -33,6 +32,10 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
*/
private String bussinessType;
/**
* 业务类型中文简写（用于设置单据单号（订单号））
*/
private String bussinessBrief;
/**
* 订单号
*/
private String orderCode;
......@@ -102,5 +105,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
*/
private List<DetailListReq> detailList;
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
......@@ -109,10 +109,17 @@ public class InventoryController {
//查询箱门（cabinetBox下）所有装备简要信息列表（传递cabinetBoxId）
@PostMapping("/searchEqsByBoxId")
@ApiOperation("查询某一箱门下的所有装备简要信息")
@ApiOperation("查询某一箱门下的所有装备简要信息(list)")
public ApiRes<List<EqsBriefDto>> searchEqsByBoxId(@RequestBody @Validated(ValidationApi.detail.class) CabinetBoxReq req){
return ApiRes.success(inventoryService.searchEqsByBoxId(req));
}
//查询箱门（cabinetBox下）所有装备简要信息列表page（传递cabinetBoxId）
@PostMapping("/searchEqsByBoxIdPage")
@ApiOperation("查询某一箱门下的所有装备简要信息(page)")
public ApiRes<PageResult<EqsBriefDto>> searchEqsByBoxIdPage(@RequestBody @Validated(ValidationApi.detail.class) CabinetBoxReq req){
return ApiRes.success(inventoryService.searchEqsByBoxIdPage(req));
}
//查询单警柜箱门下的汇总信息（传递cabinetBoxId）
@PostMapping("/EqsByCabinetBoxId")
......@@ -139,12 +146,19 @@ public class InventoryController {
public ApiRes<PageResult<InventorySummary>> ShelfInventoryPage(@RequestBody @Validated(ValidationApi.edit.class) ShelfReq req){
return ApiRes.success(inventoryService.ShelfInventoryPage(req));
}
@PostMapping("/ShelfInventoryDetail")
@ApiOperation(("/通过货架id查询每件装备信息简要"))
public ApiRes<List<EqsBriefDto>> AreaInventoryDetail(@RequestBody @Validated(ValidationApi.edit.class) ShelfReq req){
@ApiOperation(("/通过货架id查询每件装备信息简要(list)"))
public ApiRes<List<EqsBriefDto>> AreaInventoryDetail(@RequestBody @Validated(ValidationApi.list.class) InventoryReq req){
return ApiRes.success(inventoryService.ShelfInventoryDetail(req));
}
@PostMapping("/ShelfEqsPage")
@ApiOperation(("/通过货架id查询每件装备信息简要(page)"))
public ApiRes<PageResult<EqsBriefDto>> ShelfInventoryPage(@RequestBody @Validated(ValidationApi.list.class) InventoryReq req){
return ApiRes.success(inventoryService.ShelfInventoryPage(req));
}
//根据区域id查询装备信息汇总(list)
@PostMapping("/AreaInventoryList")
@ApiOperation("根据区域id查询装备信息汇总(list)")
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.db.PageResult;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.junmp.jyzb.api.bean.dto.LogSummaryDto;
import com.junmp.jyzb.api.bean.dto.OrderDetailDto;
import com.junmp.jyzb.api.bean.dto.OrderDto;
import com.junmp.jyzb.api.bean.dto.OrderMainDto;
import com.junmp.jyzb.api.bean.query.OrderDetailReq;
import com.junmp.jyzb.api.bean.query.OrderMainReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
import com.junmp.jyzb.entity.OrderMain;
import com.junmp.jyzb.service.LogSummaryService;
import com.junmp.jyzb.service.OrderLogService;
import com.junmp.jyzb.service.OrderService;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -27,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@RestController
@Slf4j
......@@ -72,28 +62,19 @@ public class OrderController {
return ApiRes.success(orderService.updateOrder(req));
}
//根据任务单id查询对应的任务单信息
@PostMapping("/GetOrderMain")
@ApiOperation("查询任务单信息")
public ApiRes<OrderMainDto> getOrderMain(@RequestBody @Validated(ValidationApi.detail.class)OrderMainReq req) {
OrderMainDto orderMainDto = orderService.showOrderMain(req);
return ApiRes.success(orderMainDto);
//查询任务列表(根据组织机构id)
@PostMapping("/GetOrderPage")
@ApiOperation("/查询任务列表")
public ApiRes<PageResult<OrderMainDto>> getOrderPage(@RequestBody @Validated(ValidationApi.add.class)OrderMainReq req ){
return ApiRes.success(orderService.getOrderPage(req));
}
//根据任务单id查询详细信息
@PostMapping("/GetOrderDetail")
@PostMapping("/GetDetailById")
@ApiOperation("根据任务单id查看业务明细")
public ApiRes<List<OrderDetailDto>> getOrderDetail(@RequestBody @Validated(ValidationApi.detail.class) OrderDetailReq req){
List<OrderDetailDto> orderDetail = orderService.getOrderDetail(req);
return ApiRes.success(orderDetail);
public ApiRes<OrderDto> GetDetailById(@RequestBody @Validated(ValidationApi.detail.class) OrderMainReq req){
return ApiRes.success(orderService.GetDetailById(req));
}
//查询任务列表
// @PostMapping("/GetOrgderPage")
// @ApiOperation("/查询任务列表")
// public ApiRes<PageResult<OrderMain>> getOrgderPage(@RequestBody @Validated(ValidationApi.edit.class)OrderMainReq req ){
// return ApiRes.success();
// }
// //将工作单添加到rabbitmq中去
// @PostMapping("/AddOrderRabbitMq")
// @ApiOperation("将工作单添加到rabbitmq消息队列中去")
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderDetail.java
......@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
......@@ -25,31 +26,31 @@ import java.util.Date;
private String type;
@TableField("equipment_type")
private String equipmentType;
private String typeId;
@TableField("equipment_type_name")
private String equipmentTypeName;
private String typeName;
@TableField("equipment_size")
private Long equipmentSize;
private Long sizeId;
@TableField("equipment_size_name")
private String equipmentSizeName;
private String sizeName;
@TableField("equipment_supplier")
private Long equipmentSupplier;
private String supplierId;
@TableField("equipment_supplier_name")
private String equipmentSupplierName;
private String supplierName;
@TableField("plan_num")
private String planNum;
private Integer planNum;
@TableField("actual_num")
private String actualNum;
private Integer actualNum;
@TableField("price")
private String price;
private BigDecimal price;
@TableField("order_type")
private String orderType;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderMain.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.xml.soap.Text;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ApiModel(value="com-junmp-jyzb-domain-BussinessOrderMain")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("bussiness_order_main")
public class OrderMain implements Serializable {
@TableId(value = "id",type = IdType.ASSIGN_UUID )
private String id;
@TableField("order_type")
......@@ -60,6 +55,10 @@ public class OrderMain implements Serializable {
@TableField("examine_state")
private String examineState;
@TableField("form_item")
private String formItem;
@TableField("price")
private BigDecimal price;
......@@ -81,6 +80,15 @@ public class OrderMain implements Serializable {
@TableField("inv_list")
private String invList;
@TableField("return_data")
private Date returnData;
@TableField("use_date")
private Date useDate;
@TableField("note")
private String note;
/**
* 创建时间
*/
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderNum.java
......@@ -17,7 +17,7 @@ import java.util.Date;
@TableName("bussiness_order_num")
public class OrderNum implements Serializable {
@TableId(value = "id",type = IdType.ASSIGN_UUID )
private Integer id;
private String id;
@TableField("out_in_type")
private String outInType;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventoryService.java
......@@ -48,7 +48,8 @@ public interface InventoryService extends IService<Inventory> {
PageResult<InventorySummary> ShelfInventoryPage(ShelfReq req);
//通过货架id查询装备简要信息
List<EqsBriefDto> ShelfInventoryDetail(ShelfReq req);
List<EqsBriefDto> ShelfInventoryDetail(InventoryReq req);
PageResult<EqsBriefDto> ShelfInventoryPage(InventoryReq req);
//通过区域id查询装备信息汇总(list)
List<InventorySummary> AreaInventoryList(WarehouseAreaReq req);
......@@ -74,6 +75,6 @@ public interface InventoryService extends IService<Inventory> {
//通过条件查询装备数量报表
List<EqsSumDto> GetListEquipment(InventoryReq req);
//查询箱门（cabinetBox下）所有装备简要信息列表page（传递cabinetBoxId）
PageResult<EqsBriefDto> searchEqsByBoxIdPage(CabinetBoxReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.junmp.jyzb.api.bean.dto.OrderDetailDto;
import com.junmp.jyzb.api.bean.dto.OrderDto;
import com.junmp.jyzb.api.bean.dto.OrderMainDto;
import com.junmp.jyzb.api.bean.query.OrderDetailReq;
import com.junmp.jyzb.api.bean.query.OrderMainReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
import com.junmp.jyzb.entity.OrderMain;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import com.junmp.v2.db.api.page.PageResult;
import java.util.Map;
public interface OrderService extends IService<OrderMain> {
......@@ -22,14 +17,17 @@ public interface OrderService extends IService<OrderMain> {
Boolean updateOrder(UpdateOrderReq req);
//通过任务单id获取任务单信息orderMain
OrderMainDto showOrderMain(OrderMainReq req);
//判断任务单是否存在
OrderMain orderMainExist(String id);
//根据任务单id查询详细信息
List<OrderDetailDto> getOrderDetail(OrderDetailReq req);
//查询任务列表(根据组织机构id)
PageResult<OrderMainDto> getOrderPage(OrderMainReq req);
//根据任务单id查看业务明细
OrderDto GetDetailById(OrderMainReq req);
//设置page的pageNo和pageSize的通用方法
public Map<String,Long> getPage(Long no,Long size);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -33,6 +33,7 @@ import com.junmp.jyzb.mapper.InventoryMapper;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
@Service
......@@ -73,6 +74,9 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
@Resource
private OfficeExcelApi officeExcelApi;
@Resource
private OrderService orderService;
@Override
public InventoryDto getInventoryDetail(InventoryReq req) {
Inventory inventory = InventoryExist(req.getId());
......@@ -146,21 +150,17 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
return updateBatchById(inventoryList);
}
//根据Epc查询装备信息(简要信息)
//根据Epc查询装备信息
@Override
public List<InventoryDto> GetInvInfoByEpc(InventoryReq req) {
List<InventoryDto> inventoryDtoList=new ArrayList<>();
//判断传入的是否为空
List<String> epcList = req.getEpcList();
if (epcList.size()==0){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
}
//迭代器遍历列表
Iterator<String> iterator = epcList.iterator();
while (iterator.hasNext()){
String epc = iterator.next();
Inventory inventory = getOne(new LambdaQueryWrapper<Inventory>().eq(Inventory::getEpc, epc));
if (Objects.isNull(inventory)){
List<InventoryDto> collect = epcList.parallelStream().map(s -> {
Inventory inventory = getOne(new LambdaQueryWrapper<Inventory>().eq(Inventory::getEpc, s));
if (Objects.isNull(inventory)) {
throw new ServiceException(InventoryExceptionEnum.INVENTORY_NOT_EXIST);
}
InventoryDto inventoryDto = new InventoryDto();
......@@ -168,13 +168,15 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
//设置型号名称，类别名称，供应商名称
String sizeName = equipmentSizeService.getById(inventory.getSizeId()).getName();
String typeName = equipmentTypeService.getById(inventory.getTypeId()).getName();
if (inventory.getSupplierId() != null) {
String supplierName = supplierService.getById(inventory.getSupplierId()).getName();
inventoryDto.setSizeName(sizeName);
inventoryDto.setTypeName(typeName);
inventoryDto.setSupplierName(supplierName);
inventoryDtoList.add(inventoryDto);
}
return inventoryDtoList;
inventoryDto.setSizeName(sizeName);
inventoryDto.setTypeName(typeName);
return inventoryDto;
}).collect(Collectors.toList());
return collect;
}
//根据组织机构/单警柜id/仓库id查询每件装备细信的详息（返回结果是List）
......@@ -213,18 +215,9 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
}else {
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
}
long pageSize;
long pageNo;
if (ObjectUtil.isNull(req.getPageNo())){
pageNo = 1L;
}else {
pageNo= req.getPageNo();
}
if ( ObjectUtil.isNull(req.getPageSize())){
pageSize = 20L;
}else {
pageSize= req.getPageSize();
}
Map<String, Long> map = orderService.getPage(req.getPageNo(), req.getPageSize());
Long pageNo = map.get("pageNo");
Long pageSize = map.get("pageSize");
Page<InventoryDto> page=new Page<>(pageNo,pageSize);
IPage<InventoryDto> pages= inventoryMapper.EqsByTypePage(page,req.getQueryType(),req.getOrgId(),req.getWarehouseId(),req.getCabinetId());
page.setRecords(pages.getRecords());
......@@ -235,7 +228,9 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
@Override
public List<EqsBriefDto> searchEqsByBoxId(CabinetBoxReq req) {
List<Inventory> list = list(new LambdaQueryWrapper<Inventory>()
.eq(Inventory::getLocationId, req.getId()));
.eq(Inventory::getLocationId, req.getId())
.orderByDesc(Inventory::getTypeId)
.orderByDesc(Inventory::getSizeId));
if (list.size()==0){
throw new ServiceException(CabinetBoxExceptionEnum.CABINETBOX_ISNOT_EXISTS);
}
......@@ -245,20 +240,50 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
Inventory next = iterator.next();
EqsBriefDto eqsBriefDto = new EqsBriefDto();
BeanPlusUtil.copyProperties(next,eqsBriefDto);
Map<String, String> map = setNames(eqsBriefDto.getSizeId(), eqsBriefDto.getTypeId(), eqsBriefDto.getSupplierId());
//设置typeName
eqsBriefDto.setTypeName(equipmentSizeService.getOne(new LambdaQueryWrapper<EquipmentSize>()
.eq(EquipmentSize::getId,eqsBriefDto.getSizeId())).getName());
eqsBriefDto.setTypeName(map.get("typeName"));
//设置sizeName
eqsBriefDto.setSizeName(equipmentTypeService.getOne(new LambdaQueryWrapper<EquipmentType>()
.eq(EquipmentType::getId,eqsBriefDto.getTypeId())).getName());
//设置supplierName
eqsBriefDto.setSupplierName(supplierService.getOne(new LambdaQueryWrapper<Supplier>()
.eq(Supplier::getId,eqsBriefDto.getSupplierId())).getName());
eqsBriefDto.setSizeName(map.get("sizeName"));
//如果有供应商id的前提下，设置supplierName
if (ObjectUtil.isNotNull(eqsBriefDto.getSupplierId())){
eqsBriefDto.setSupplierName(map.get("supplierName"));
}
eqsBriefDtoList.add(eqsBriefDto);
}
return eqsBriefDtoList;
}
//查询箱门（cabinetBox下）所有装备简要信息列表page（传递cabinetBoxId）
@Override
public PageResult<EqsBriefDto> searchEqsByBoxIdPage(CabinetBoxReq req) {
// List<EqsBriefDto> eqsBriefDtoList = searchEqsByBoxId(req);
List<Inventory> list = list(new LambdaQueryWrapper<Inventory>()
.eq(Inventory::getLocationId, req.getId())
.orderByDesc(Inventory::getTypeId)
.orderByDesc(Inventory::getSizeId));
List<EqsBriefDto> eqsBriefDtoList=list.parallelStream()
.map(inventory -> {
EqsBriefDto eqsBriefDto = new EqsBriefDto();
BeanPlusUtil.copyProperties(inventory,eqsBriefDto);
Map<String, String> map = setNames(eqsBriefDto.getTypeId(), eqsBriefDto.getSizeId(), eqsBriefDto.getSupplierId());
//设置typeName
eqsBriefDto.setTypeName(map.get("typeName"));
//设置sizeName
eqsBriefDto.setSizeName(map.get("sizeName"));
//如果有供应商id的前提下，设置supplierName
if (ObjectUtil.isNotNull(eqsBriefDto.getSupplierId())){
eqsBriefDto.setSupplierName(map.get("supplierName"));
}
return eqsBriefDto;
}).collect(Collectors.toList());
Map<String, Long> map = orderService.getPage(req.getPageNo(), req.getPageSize());
Long pageNo = map.get("pageNo");
Long pageSize = map.get("pageSize");
long count=eqsBriefDtoList.size();
return PageResultFactory.createPageResult(eqsBriefDtoList,count,pageSize,pageNo);
}
//根据货架id获取装备列表汇总信息(list)
@Override
......@@ -276,50 +301,75 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
//判断货架是否存在
Shelf shelf = shelfService.ShelfExist(req.getShelfId());
warehouseService.WarehoustExist(shelf.getWarehouseId());
long pageSize;
long pageNo;
if (ObjectUtil.isNull(req.getPageNo())){
pageNo = 1L;
}else {
pageNo= req.getPageNo();
}
if ( ObjectUtil.isNull(req.getPageSize())){
pageSize = 20L;
}else {
pageSize= req.getPageSize();
}
Map<String, Long> map = orderService.getPage(req.getPageNo(), req.getPageSize());
Long pageNo = map.get("pageNo");
Long pageSize = map.get("pageSize");
Page<InventorySummary> page=new Page<>(pageNo,pageSize);
IPage<InventorySummary> pages = inventoryMapper.ShelfInventoryPage(page,req.getShelfId());
pages.setRecords(pages.getRecords());
return PageResultFactory.createPageResult(page);
}
//通过货架id查询装备简要信息
//通过货架id查询装备简要信息（list）
@Override
public List<EqsBriefDto> ShelfInventoryDetail(ShelfReq req) {
public List<EqsBriefDto> ShelfInventoryDetail(InventoryReq req) {
//判断货架是否存在
Shelf shelf = shelfService.ShelfExist(req.getShelfId());
warehouseService.WarehoustExist(shelf.getWarehouseId());
List<Inventory> list = list(new LambdaQueryWrapper<Inventory>()
.eq(Inventory::getShelfId, req.getShelfId()));
List<EqsBriefDto> eqsBriefDtoList=new ArrayList<>();
for (Inventory inventory:list) {
.eq(Inventory::getShelfId, req.getShelfId())
.orderByDesc(Inventory::getTypeId)
.orderByDesc(Inventory::getSizeId));
List<EqsBriefDto> eqsBriefDtoList=list.parallelStream()
.map(inventory -> {
EqsBriefDto eqsBriefDto = new EqsBriefDto();
BeanPlusUtil.copyProperties(inventory,eqsBriefDto);
Map<String, String> map = setNames( eqsBriefDto.getTypeId(),eqsBriefDto.getSizeId(), eqsBriefDto.getSupplierId());
//设置typeName
eqsBriefDto.setTypeName(equipmentSizeService.getOne(new LambdaQueryWrapper<EquipmentSize>()
.eq(EquipmentSize::getId,eqsBriefDto.getSizeId())).getName());
eqsBriefDto.setTypeName(map.get("typeName"));
//设置sizeName
eqsBriefDto.setSizeName(equipmentTypeService.getOne(new LambdaQueryWrapper<EquipmentType>()
.eq(EquipmentType::getId,eqsBriefDto.getTypeId())).getName());
//设置supplierName
eqsBriefDto.setSupplierName(supplierService.getOne(new LambdaQueryWrapper<Supplier>()
.eq(Supplier::getId,eqsBriefDto.getSupplierId())).getName());
eqsBriefDtoList.add(eqsBriefDto);
eqsBriefDto.setSizeName(map.get("sizeName"));
//如果有供应商id的前提下，设置supplierName
if (ObjectUtil.isNotNull(eqsBriefDto.getSupplierId())){
eqsBriefDto.setSupplierName(map.get("supplierName"));
}
return eqsBriefDto;
}).collect(Collectors.toList());
return eqsBriefDtoList;
}
//通过货架id查询装备简要信息（page）
@Override
public PageResult<EqsBriefDto> ShelfInventoryPage(InventoryReq req) {
Shelf shelf = shelfService.ShelfExist(req.getShelfId());
warehouseService.WarehoustExist(shelf.getWarehouseId());
List<Inventory> list = list(new LambdaQueryWrapper<Inventory>()
.eq(Inventory::getShelfId, req.getShelfId())
.orderByDesc(Inventory::getTypeId)
.orderByDesc(Inventory::getSizeId));
List<EqsBriefDto> eqsBriefDtoList=list.parallelStream()
.map(inventory -> {
EqsBriefDto eqsBriefDto = new EqsBriefDto();
BeanPlusUtil.copyProperties(inventory,eqsBriefDto);
Map<String, String> map = setNames( eqsBriefDto.getTypeId(),eqsBriefDto.getSizeId(), eqsBriefDto.getSupplierId());
//设置typeName
eqsBriefDto.setTypeName(map.get("typeName"));
//设置sizeName
eqsBriefDto.setSizeName(map.get("sizeName"));
//如果有供应商id的前提下，设置supplierName
if (ObjectUtil.isNotNull(eqsBriefDto.getSupplierId())){
eqsBriefDto.setSupplierName(map.get("supplierName"));
}
return eqsBriefDto;
}).collect(Collectors.toList());
Map<String, Long> map = orderService.getPage(req.getPageNo(), req.getPageSize());
Long pageNo = map.get("pageNo");
Long pageSize = map.get("pageSize");
long count=eqsBriefDtoList.size();
return PageResultFactory.createPageResult(eqsBriefDtoList,count,pageSize,pageNo);
}
/**
* 通过区域id查询装备汇总信息
* @param req
......@@ -339,18 +389,9 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
//判断区域是否存在
WarehouseArea warehouseArea = warehouseAreaService.WarehouseAreaExist(req.getId());
warehouseService.WarehoustExist(warehouseArea.getWarehouseId());
long pageSize;
long pageNo;
if (ObjectUtil.isNull(req.getPageNo())){
pageNo = 1L;
}else {
pageNo= req.getPageNo();
}
if ( ObjectUtil.isNull(req.getPageSize())){
pageSize = 20L;
}else {
pageSize= req.getPageSize();
}
Map<String, Long> map = orderService.getPage(req.getPageNo(), req.getPageSize());
Long pageNo = map.get("pageNo");
Long pageSize = map.get("pageSize");
Page<InventorySummary> page = new Page<>(pageNo,pageSize);
IPage<InventorySummary> pages= inventoryMapper.AreaInventoryPage(page,req.getId());
page.setRecords(pages.getRecords());
......@@ -369,8 +410,9 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
@Override
public PageResult<InventorySummary> EqsByCabinetBoxIdPage(CabinetBoxReq req) {
cabinetBoxService.CabinetBoxExist(req.getId());
long pageSize = 20L;
long pageNo = 1L;
Map<String, Long> map = orderService.getPage(req.getPageNo(), req.getPageSize());
Long pageNo = map.get("pageNo");
Long pageSize = map.get("pageSize");
Page<InventorySummary> page=new Page<>(pageNo,pageSize);
IPage<InventorySummary> pages = inventoryMapper.EqsByCabinetBoxIdPage(page,req.getId());
page.setRecords(pages.getRecords());
......@@ -419,6 +461,8 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
return inventoryMapper.GetListEquipment(req);
}
//通过id判断装备是否存在
@Override
public Inventory InventoryExist(String id) {
......@@ -429,4 +473,23 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
return invMap;
}
//通用方法，用于设置对象的typeName属性，sizeName属性和supplierName属性
public Map<String,String> setNames (String typeId,String sizeId,String supplierId){
Map<String,String> map=new HashMap<>();
String sizeName = equipmentSizeService.getOne(new LambdaQueryWrapper<EquipmentSize>()
.eq(EquipmentSize::getId, sizeId)).getName();
String typeName = equipmentTypeService.getOne(new LambdaQueryWrapper<EquipmentType>()
.eq(EquipmentType::getId, typeId)).getName();
//如果有供应商id的前提下，设置supplierName
if (ObjectUtil.isNotNull(supplierId)){
String supplierName = supplierService.getOne(new LambdaQueryWrapper<Supplier>()
.eq(Supplier::getId, supplierId)).getName();
map.put("supplierName",supplierName);
}
map.put("sizeName",sizeName);
map.put("typeName",typeName);
return map;
}
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java
......@@ -8,6 +8,7 @@ import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.service.InventorySummaryService;
import com.junmp.jyzb.service.OrderService;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.db.api.factory.PageFactory;
......@@ -18,6 +19,7 @@ import com.junmp.jyzb.mapper.InventorySummaryMapper;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@Service
public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMapper, InventorySummary> implements InventorySummaryService {
......@@ -25,6 +27,9 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
@Resource
private PubOrgService pubOrgService;
@Resource
private OrderService orderService;
//根据条件查询库存汇总信息
@Override
public PageResult<InventorySummary> getEquipmentInfo(InventorySumReq req) {
......@@ -36,8 +41,15 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
//如果传递了参数则判断是否存在，不存在则表示传递的参数一定不正确
if (ObjectUtil.isNotNull(req.getLocationId())){
List<InventorySummary> list = list(new LambdaQueryWrapper<InventorySummary>().eq(InventorySummary::getLocationId, req.getLocationId()));
//表示该单警柜或者仓库没有装备，那么直接返回一个空对象，设置一些简单的参数
if (list.size()==0){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
Map<String, Long> map = orderService.getPage(req.getPageNo(), req.getPageSize());
Page<InventorySummary> page=new Page<>(map.get("pageNo"), map.get("pageSize") );
InventorySummary inventorySummary = new InventorySummary();
list.add(inventorySummary);
page.setRecords(list);
return PageResultFactory.createPageResult(page);
}
}
LambdaQueryWrapper<InventorySummary> wp = createWrapper(req);//取出仓库中总数并计算
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderNumServiceImpl.java
......@@ -6,6 +6,8 @@ import com.junmp.jyzb.entity.OrderNum;
import com.junmp.jyzb.mapper.OrderMainMapper;
import com.junmp.jyzb.mapper.OrderNumMapper;
import com.junmp.jyzb.service.OrderNumService;
import org.springframework.stereotype.Service;
@Service
public class OrderNumServiceImpl extends ServiceImpl<OrderNumMapper, OrderNum> implements OrderNumService {
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderServiceImpl.java
package com.junmp.jyzb.service.impl;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.junmp.jyzb.api.bean.dto.OrderDetailDto;
import com.junmp.jyzb.api.bean.dto.OrderDto;
import com.junmp.jyzb.api.bean.dto.OrderMainDto;
import com.junmp.jyzb.api.bean.query.OrderDetailReq;
import com.junmp.jyzb.api.bean.query.OrderMainReq;
import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
import com.junmp.jyzb.api.bean.req.DetailListReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
......@@ -19,8 +19,13 @@ import com.junmp.jyzb.mapper.OrderMainMapper;
import com.junmp.jyzb.service.OrderDetailService;
import com.junmp.jyzb.service.OrderNumService;
import com.junmp.jyzb.service.OrderService;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.amqp.core.Queue;
import org.springframework.amqp.rabbit.core.RabbitAdmin;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
......@@ -29,6 +34,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
......@@ -46,6 +52,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
@Resource
private OrderNumService orderNumService;
@Resource
private PubOrgService pubOrgService;
@Transactional(rollbackFor = Exception.class)
......@@ -53,28 +62,39 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
public String AddOrder(UpdateOrderReq req) {
OrderMain order = new OrderMain();
BeanPlusUtil.copyProperties(req, order);
//设置单据单号
//设置单据单号（订单号）
OrderNum orderNum = setOrderCode(req);
String codeValue=String.format("%04d",orderNum.getNum());
order.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getOutInType()+"-"+orderNum.getYear()+"-"+codeValue);
//保存
this.save(order);
//设置总价格和应出入库数量
//设置id
String id=UUID.randomUUID().toString();
order.setId(id);
Integer sumNum=0;
BigDecimal priceTotal=new BigDecimal(0);
List<OrderDetail> detailList = new ArrayList<>();
//通过遍历批量保存详细信息
req.getDetailList().forEach(p->
{
for (DetailListReq listReq:req.getDetailList()) {
OrderDetail detail=new OrderDetail();
BeanPlusUtil.copyProperties(p, detail);
detail.setOrderId(order.getId());
BeanPlusUtil.copyProperties(listReq, detail);
detail.setOrderId(id);
//设置单据类型
detail.setType(order.getOrderType());
//将数量和价格进行累加
sumNum += detail.getPlanNum();
priceTotal = priceTotal.add(BigDecimal.valueOf(detail.getPlanNum()).multiply(detail.getPrice())) ;
detailList.add(detail);
});
}
orderDetailService.saveBatch(detailList);
//设置总价格和总数量
order.setPrice(priceTotal);
order.setInventoryQuantity(sumNum);
//保存
this.save(order);
return order.getId();
}
//设置单据单号（并且对order_num表进行新增或者更新）
public OrderNum setOrderCode(UpdateOrderReq req){
//设置采购单号，需要先判断改组织机构的采购单号是否存在，如果存在则将数量进行增加，如果不存在则新增一条对应的数据
......@@ -87,8 +107,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
}else {
orderNum.setOrgId(Long.valueOf(req.getStartOrgId()));
}
//业务类型
orderNum.setBussinessType(req.getBussinessType());
//业务类型(简写)
orderNum.setBussinessType(req.getBussinessBrief());
//出入业务状态
orderNum.setOutInType(req.getOrderType());
......@@ -100,32 +120,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
if (ObjectUtil.isNull(one)){
orderNum.setNum(1);
orderNumService.save(orderNum);
return orderNum;
}else {
orderNum.setNum(one.getNum()+1);
orderNumService.updateById(orderNum);
one.setNum(one.getNum()+1);
orderNumService.updateById(one);
return one;
}
return orderNum;
}
@Transactional(rollbackFor = Exception.class)
@Override
public String AddFinishOrder(UpdateOrderReq req) {
OrderMain order = new OrderMain();
BeanPlusUtil.copyProperties(req, order);
//保存
this.save(order);
List<OrderDetail> detailList = new ArrayList<>();
//通过遍历批量保存详细信息
req.getDetailList().forEach(p->
{
OrderDetail detail=new OrderDetail();
BeanPlusUtil.copyProperties(p, detail);
detail.setOrderId(order.getId());
//设置单据类型
detail.setType(order.getOrderType());
detailList.add(detail);
});
orderDetailService.saveBatch(detailList);
//添加到数据库中
String orderId = AddOrder(req);
//将完成的任务单直接推送到消息队列rabbitmq中（需要判断是入库单还是出库单，入库单传发物单位id，出库单传收物单位id）
//方法1：一个交换机，一个队列。通过中间对象，object存储对象，type表标识
// if(req.getOrderType().equals("in")){
......@@ -153,8 +162,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
rabbitTemplate.convertAndSend(exchangeName, req.getStartOrgId(), req);
}
return order.getId();
return orderId;
}
......@@ -167,17 +175,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
}
List<OrderDetail> list= orderDetailService.QueryList(req.getId());
//idSet中存放的是存在数据库中的任务单中的orderDetail中的id（原始的工作单中的数据id）
Set<String> idSet =new HashSet<>();
for (OrderDetail orderDetail:list){
idSet.add(Long.toString(orderDetail.getId()));
}
//将该任务单的所有id转换为String,并添加到updateList中，用来判断删除或者修改新增的是否存在
//判断删除列表是否为空，如果不为空则进行批量删除
if (req.getDeleteList() != null && !req.getDeleteList().isEmpty())
{
if (ObjectUtil.isNotNull(req.getDeleteList())&& ObjectUtil.isNotEmpty(req.getDeleteList())) {
//判断传递的list Id是否存在，如果不存在则抛出异常
for (String s:req.getDeleteList()){
if (idSet.contains(s)){
//将要删除的装备价格和数据进行查询出来，并别对任务单的总数量和总价格进行更改
OrderDetail one = orderDetailService.getOne(new LambdaQueryWrapper<OrderDetail>()
.eq(OrderDetail::getOrderId, s));
order.setPrice(order.getPrice().subtract(one.getPrice().multiply(BigDecimal.valueOf(one.getPlanNum()))));
order.setInventoryQuantity(order.getInventoryQuantity() - one.getPlanNum());
orderDetailService.removeBatchByIds(req.getDeleteList());
}else {
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
......@@ -185,8 +198,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
}
}
//对detaillist进行处理
List<OrderDetail> addList = new ArrayList<>();
List<OrderDetail> updateList = new ArrayList<>();
List<OrderDetail> addList = new ArrayList<>();//新增的
List<OrderDetail> updateList = new ArrayList<>();//更新
for (DetailListReq detailListReq :req.getDetailList()) {
//判断是否存在，存在则进行修改
if (idSet.contains(detailListReq.getId())){
......@@ -194,14 +207,23 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
.eq(OrderDetail::getId, detailListReq.getId()));
BeanPlusUtil.copyProperties(detailListReq,one);
one.setType(req.getOrderType());
//判断数量和价格是否有变动，如果有变动，则将order的总价和总数量进行更新操作，否则不变
if (one.getPlanNum().equals(detailListReq.getPlanNum()) && one.getPrice().compareTo(detailListReq.getPrice())!=0){
order.setPrice(order.getPrice().subtract(one.getPrice().multiply(BigDecimal.valueOf(one.getPlanNum())))
.add(detailListReq.getPrice().multiply(BigDecimal.valueOf(detailListReq.getPlanNum()))));
order.setInventoryQuantity(order.getInventoryQuantity() - one.getPlanNum()+ detailListReq.getPlanNum());
}
updateList.add(one);
}else {
//否则判断id是否为空或者错误，如果为空则添加，不为空则抛出异常
if (detailListReq.getId()==null || detailListReq.getId().equals("")){
if (ObjectUtil.isNull(detailListReq.getId()) || detailListReq.getId().equals("") || ObjectUtil.isEmpty(detailListReq.getId())){
OrderDetail detail=new OrderDetail();
BeanPlusUtil.copyProperties(detailListReq, detail);
detail.setOrderId(req.getId());
detail.setType(req.getOrderType());
//将数量和价格进行相加处理
order.setPrice(order.getPrice().add(detailListReq.getPrice().multiply(BigDecimal.valueOf(detailListReq.getPlanNum()))));
order.setInventoryQuantity(order.getInventoryQuantity() + detailListReq.getPlanNum());
addList.add(detail);
}else {
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
......@@ -225,33 +247,73 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
}
//通过任务单id获取任务单信息orderMain
//查询任务列表(根据组织机构id)
@Override
public OrderMainDto showOrderMain(OrderMainReq req) {
//判断任务单是否存在
OrderMain orderMain = orderMainExist(req.getId());
public PageResult<OrderMainDto> getOrderPage(OrderMainReq req) {
//判断组织机构是否存在
pubOrgService.PubOrgExist(req.getOrgId());
//判断是出库单还是入库单，选择的查询条件也不相同
Page<OrderMain> page=new Page<>();
LambdaQueryWrapper<OrderMain> wrapper = createWrapper(req);
if (req.getOrderType() != null && req.getOrderType().equals("in")){//入库单
LambdaQueryWrapper<OrderMain> eq = wrapper.eq(OrderMain::getOrderType, req.getOrderType())
.eq(OrderMain::getEndOrgId, req.getOrgId());
page=this.page(PageFactory.getDefaultPage(),eq);
} else if (req.getOrderType() != null && req.getOrderType().equals("out")) {//出库单
LambdaQueryWrapper<OrderMain> eq = wrapper.eq(OrderMain::getOrderType, req.getOrderType()).eq(OrderMain::getStartOrgId, req.getOrgId());
page=this.page(PageFactory.getDefaultPage(),eq);
}else {//查询全部
Page<OrderMain> page1=new Page<>();
Page<OrderMain> page2=new Page<>();
LambdaQueryWrapper<OrderMain> eq1 = wrapper.eq(OrderMain::getEndOrgId, req.getOrgId());
page1=this.page(PageFactory.getDefaultPage(),eq1);
LambdaQueryWrapper<OrderMain> eq2 = wrapper.eq(OrderMain::getStartOrgId, req.getOrgId());
page2=this.page(PageFactory.getDefaultPage(),eq2);
List<OrderMain> list = new ArrayList<>();
list.addAll(page1.getRecords());
list.addAll(page2.getRecords());
page.setRecords(list);
}
List<OrderMainDto> orderMainDtoList=new ArrayList<>();
//遍历page,(如果出入库的组织机构为同一个的时候需要进行去重处理，不然会存在两条重复的数据)
for (OrderMain orderMain : page.getRecords()){
OrderMainDto orderMainDto = new OrderMainDto();
BeanPlusUtil.copyProperties(orderMain,orderMainDto);
return orderMainDto;
if (!orderMainDtoList.contains(orderMainDto)){
orderMainDtoList.add(orderMainDto);
}
}
//设置pageSize，pageNo,count,list
Map<String, Long> map = getPage(req.getPageNo(), req.getPageSize());
Long pageNo = map.get("pageNo");
Long pageSize = map.get("pageSize");
long count=orderMainDtoList.size();
return PageResultFactory.createPageResult(orderMainDtoList,count,pageSize,pageNo);
}
//根据任务单id查询详细信息
//根据任务单id查看业务明细
@Override
public List<OrderDetailDto> getOrderDetail(OrderDetailReq req) {
orderMainExist(req.getOrderId());
List<OrderDetail> list = orderDetailService.QueryList(req.getOrderId());
public OrderDto GetDetailById(OrderMainReq req) {
//判断任务单是否存在
OrderMain orderMain = orderMainExist(req.getId());
OrderDto orderDto = new OrderDto();
BeanPlusUtil.copyProperties(orderMain,orderDto);
//将详细信息存入列表属性中
//通过任务单id查询对应的详细信息
List<OrderDetail> list = orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
.eq(OrderDetail::getOrderId, req.getId()));
List<OrderDetailDto> orderDetailDtoList=new ArrayList<>();
for (OrderDetail orderDetail:list) {
OrderDetailDto orderDetailDto = new OrderDetailDto();
BeanPlusUtil.copyProperties(orderDetail,orderDetailDto);
orderDetailDtoList.add(orderDetailDto);
}
return orderDetailDtoList;
orderDto.setDetailList(orderDetailDtoList);
return orderDto;
}
//判断任务单是否存在
@Override
public OrderMain orderMainExist(String id) {
......@@ -262,5 +324,36 @@ public class OrderServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> i
return order;
}
//设置pageNo和pageSize的通用方法
public Map<String,Long> getPage(Long no,Long size){
Map<String,Long> map=new HashMap<>();
long pageSize;
long pageNo;
if (ObjectUtil.isNull(no)){
pageNo = 1L;
}else {
pageNo= no;
}
if ( ObjectUtil.isNull(size)){
pageSize = 20L;
}else {
pageSize= size;
}
map.put("pageNo",pageNo);
map.put("pageSize",pageSize);
return map;
}
private LambdaQueryWrapper<OrderMain> createWrapper(OrderMainReq req) {
LambdaQueryWrapper<OrderMain> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
wrapper.eq(ObjectUtil.isNotEmpty(req.getOrderState()), OrderMain::getOrderState, req.getOrderState());
wrapper.eq(ObjectUtil.isNotEmpty(req.getExamineState()), OrderMain::getExamineState, req.getExamineState());
wrapper.eq(ObjectUtil.isNotEmpty(req.getManualState()), OrderMain::getManualState, req.getManualState());
return wrapper;
}
}
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
......@@ -160,7 +160,7 @@ delete from base_inventory_summary
i.location_id as locationId,
</if>
<if test="queryType=='cabinet'">
bcb.cabinet_id as locationId,
(select id from base_cabinet where id =#{cabinetId}) as locationId,
</if>
i.price as price,
i.shelf_id as shelfId,
......@@ -183,7 +183,6 @@ delete from base_inventory_summary
join base_equipment_size es on es.id = i.size_id
join base_supplier s on s.id = i.supplier_id
join pub_org po on i.org_id_int=po.org_id
join base_cabinet_box bcb on bcb.id=i.location_id
<if test="queryType == 'org'">
where org_id_int = #{orgId}
</if>
......@@ -193,6 +192,7 @@ delete from base_inventory_summary
<if test="queryType == 'cabinet'">
where location_id in (select id from base_cabinet_box where cabinet_id =#{cabinetId})
</if>
ORDER BY i.type_id,i.size_id
</select>
<select id="getSumByShelf" resultType="com.junmp.jyzb.entity.InventorySummary"
parameterType="java.lang.String">
......@@ -220,7 +220,8 @@ delete from base_inventory_summary
join base_equipment_size s on s.id = bi.size_id
join pub_org po on bi.org_id_int = po.org_id
WHERE location_type = 0
GROUP BY type_id,size_id,bi.org_id_int,shelf_id)as t
GROUP BY type_id,size_id,bi.org_id_int,shelf_id
ORDER BY type_id,size_id)as t
where shelf_id=#{shelfId}
</select>
......@@ -249,7 +250,7 @@ delete from base_inventory_summary
join pub_org po on bi.org_id_int = po.org_id
WHERE location_type = 0 and bi.area_id=#{id}
GROUP BY type_id,size_id,bi.org_id_int,bi.area_id
ORDER BY type_id,size_id
</select>
<select id="getSumByCabinetBox" resultType="com.junmp.jyzb.entity.InventorySummary"
parameterType="java.lang.String">
......@@ -277,6 +278,7 @@ delete from base_inventory_summary
join pub_org po on bi.org_id_int = po.org_id
WHERE bi.location_type = 1 and bi.location_id=#{id}
GROUP BY location_id, type_id,size_id,bi.org_id_int
ORDER BY type_id,size_id
</select>
<select id="GetListEquipment" resultType="com.junmp.jyzb.api.bean.dto.EqsSumDto">
SELECT
......@@ -369,7 +371,7 @@ delete from base_inventory_summary
i.location_id as locationId,
</if>
<if test="queryType=='cabinet'">
bcb.cabinet_id as locationId,
(select id from base_cabinet where id =#{cabinetId}) as locationId,
</if>
i.price as price,
i.shelf_id as shelfId,
......@@ -392,7 +394,6 @@ delete from base_inventory_summary
join base_equipment_size es on es.id = i.size_id
join base_supplier s on s.id = i.supplier_id
join pub_org po on i.org_id_int=po.org_id
join base_cabinet_box bcb on bcb.id=i.location_id
<if test="queryType == 'org'">
where org_id_int = #{orgId}
</if>
......@@ -402,6 +403,7 @@ delete from base_inventory_summary
<if test="queryType == 'cabinet'">
where location_id in (select id from base_cabinet_box where cabinet_id =#{cabinetId})
</if>
ORDER BY i.type_id,i.size_id
</select>
<select id="EqsByCabinetBoxIdPage" resultType="com.junmp.jyzb.entity.InventorySummary">
SELECT
......@@ -428,6 +430,7 @@ delete from base_inventory_summary
join pub_org po on bi.org_id_int = po.org_id
WHERE bi.location_type = 1 and bi.location_id=#{id}
GROUP BY location_id, type_id,size_id,bi.org_id_int
ORDER BY type_id,size_id
</select>
<select id="ShelfInventoryPage" resultType="com.junmp.jyzb.entity.InventorySummary">
select t.id,t.orgId,t.orgName,t.locationId,t.locationName,t.shelf_id,t.type_id,t.typeName,t.size_id,t.sizeName,t.number,t.price,t.stockNumber,t.outboundNumber,t.location_type
......@@ -454,7 +457,8 @@ delete from base_inventory_summary
join base_equipment_size s on s.id = bi.size_id
join pub_org po on bi.org_id_int = po.org_id
WHERE location_type = 0
GROUP BY type_id,size_id,bi.org_id_int,shelf_id)as t
GROUP BY type_id,size_id,bi.org_id_int,shelf_id
ORDER BY type_id,size_id)as t
where shelf_id=#{shelfId}
</select>
<select id="AreaInventoryPage" resultType="com.junmp.jyzb.entity.InventorySummary">
......@@ -481,6 +485,7 @@ delete from base_inventory_summary
join pub_org po on bi.org_id_int = po.org_id
WHERE location_type = 0 and bi.area_id=#{id}
GROUP BY type_id,size_id,bi.org_id_int,bi.area_id
ORDER BY type_id,size_id
</select>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论