Skip to content

J
jyzb_platformV2
Commit 0b2aad03 by 李小惠
Options

修改OABug

parent 91081fd2
正在显示 包含 100 行增加 和 54 行删除
app-log/error/log-error-2024-02-29.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_error.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_total.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-02-29.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LogDetailDto.java
......@@ -64,7 +64,7 @@ public class LogDetailDto implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private String createTime;
/**
* 更新时间
......@@ -87,9 +87,9 @@ public class LogDetailDto implements Serializable {
private String picture;
/**
* 作业设备：0手持机 1单警柜 2通道）
* 作业设备：0手持机 1单警柜 2通道,3仓库，4人工记账）
*/
private Integer deviceType;
private String deviceType;
/**
* 存储ID
......@@ -104,4 +104,9 @@ public class LogDetailDto implements Serializable {
private BigDecimal price;
private String outInState;
//经办人（操作人）
private String userName;
//装备总数
private Integer number;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LogSummaryDto.java
......@@ -47,7 +47,7 @@ public class LogSummaryDto implements Serializable {
/**
* 出入设备:0手持机/1单警柜/2通道
*/
private Integer deviceType;
private String deviceType;
/**
* 操作时间
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryReassignmentReq.java
......@@ -130,5 +130,8 @@ public class QueryReassignmentReq extends BaseRequest {
private String typeName;
private String sizeName;
private String sizeId;
private String typeId;
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.LogDetailDto;
import com.junmp.jyzb.api.bean.dto.LogSummaryDto;
import com.junmp.jyzb.api.bean.dto.LogSummarySecondDto;
import com.junmp.jyzb.api.bean.dto.OrderLogDto;
import com.junmp.jyzb.api.bean.query.InventoryReq;
......@@ -66,7 +67,7 @@ public class OutAndInboundController {
@PostMapping(path = "/RecordSumByOrderId",name = "出入库单据查询展示（整个单子的记录）#enable")
@ApiOperation("出入库单据查询展示（整个单子的记录）")
public ApiRes<PageResult<LogSummary>> RecordSumByOrderId (LogSummaryReq req){
public ApiRes<PageResult<LogSummaryDto>> RecordSumByOrderId (LogSummaryReq req){
return ApiRes.success(logSummaryService.RecordSumByOrderId(req));
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/LogSummary.java
......@@ -54,7 +54,7 @@ public class LogSummary implements Serializable {
private String device;
/**
* 出入设备:0手持机/1单警柜/2通道
* 出入设备:0手持机/1单警柜/2通道/3主机/4人工记账
*/
@TableField(value = "device_type")
private Integer deviceType;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/LogSummaryMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.bean.dto.LogSummaryDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOutAndInDto;
import com.junmp.jyzb.api.bean.query.LogSummaryReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
......@@ -31,9 +30,10 @@ public interface LogSummaryMapper extends BaseMapper<LogSummary> {
LogSummary ShowInOutRecordsByItemsCount(@Param("req") LogSummaryReq req);
List<LogSummary> RecordSumByOrderId(@Param("req") LogSummaryReq req,
@Param("pageNo")Long pageNo,
@Param("pageSize")Long pageSize);
List<LogSummaryDto> RecordSumByOrderId(@Param("req") LogSummaryReq req,
@Param("pageNo")Long pageNo,
@Param("pageSize")Long pageSize);
int RecordSumByOrderIdSum(@Param("req") LogSummaryReq req);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/LogSummaryService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.api.bean.dto.LogSummaryDto;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
import com.junmp.jyzb.api.bean.query.LogSummaryReq;
......@@ -26,5 +27,5 @@ public interface LogSummaryService extends IService<LogSummary> {
LogSummary ShowInOutRecordsByItemsCount(LogSummaryReq req);
PageResult<LogSummary> RecordSumByOrderId(LogSummaryReq req);
PageResult<LogSummaryDto> RecordSumByOrderId(LogSummaryReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -428,6 +428,17 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
int size = req.getInventoryIdList().size();
List<Object[]> searchItem=new ArrayList<>();
//（判断出库几条，入库几条）
List<Inventory> list = list(new LambdaQueryWrapper<Inventory>().in(Inventory::getId, req.getInventoryIdList()));
int stockNum=0;
int outBoundNum=0;
for (Inventory inv:list) {
if (inv.getLocationState().equals("in")){
stockNum=stockNum+1;
}else {
outBoundNum=outBoundNum+1;
}
}
if (req.getPrice().compareTo(req.getOriginalPrice())!=0){
Object[] item=new Object[]{req.getOrgId(),req.getLocationId(),req.getTypeId(),req.getSizeId(),req.getPrice()};
Object[] item1=new Object[]{req.getOrgId(),req.getLocationId(),req.getTypeId(),req.getSizeId(),req.getOriginalPrice()};
......@@ -461,21 +472,39 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
inventorySummary.setExpireNumber(0);
inventorySummary.setDestructionNumber(0);
inventorySummary.setNearBrokenNumber(0);
inventorySummary.setProperty(0);
inventorySummaryService.save(inventorySummary);
inventorySummaryService.updateBatchById(inventorySummaryList);
}else {
for (InventorySummary is:inventorySummaryList) {
if (is.getUnitPrice().compareTo(req.getOriginalPrice())==0){//如果单价和修改前的价格一致
is.setStockNumber(is.getStockNumber()-size);
is.setNumber(is.getNumber()-size);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
if (stockNum!=0){
is.setStockNumber(is.getStockNumber()-stockNum);
is.setNumber(is.getNumber()-stockNum);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
}
if (outBoundNum!=0){
is.setOutboundNumber(is.getOutboundNumber()-outBoundNum);
is.setNumber(is.getNumber()-outBoundNum);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
}
if (is.getNumber()==0 && is.getStockNumber()==0 && is.getOutboundNumber()==0 && is.getDestructionNumber()==0){
delList.add(is);
}
}else {//单价和修改后的价格不一致
if (stockNum!=0){
is.setStockNumber(is.getStockNumber()+stockNum);
is.setNumber(is.getNumber()+stockNum);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
}
if (outBoundNum!=0){
is.setOutboundNumber(is.getOutboundNumber()+outBoundNum);
is.setNumber(is.getNumber()+outBoundNum);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
}
if (is.getNumber()==0 && is.getStockNumber()==0 && is.getOutboundNumber()==0 && is.getDestructionNumber()==0){
delList.add(is);
}
}else {//单价和修改后的价格一致
is.setStockNumber(is.getStockNumber()+size);
is.setNumber(is.getNumber()+size);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
}
}
......@@ -486,7 +515,6 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
}
}
List<Inventory> list = list(new LambdaQueryWrapper<Inventory>().in(Inventory::getId, req.getInventoryIdList()));
if (list.size()==0){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
}else {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/LogSummaryServiceImpl.java
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.LogSummaryDto;
import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.CabinetLogsRecordReq;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.*;
......@@ -19,7 +20,6 @@ import com.junmp.jyzb.mapper.InventorySummaryMapper;
import com.junmp.jyzb.service.*;
import com.junmp.jyzb.mapper.LogSummaryMapper;
import com.junmp.jyzb.utils.DateTimeUtil;
import com.junmp.jyzb.utils.RequestParamUitl;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory;
......@@ -139,9 +139,9 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
//根据条件查询出入库记录(整个单子的汇总记录)
@Override
public PageResult<LogSummary> RecordSumByOrderId(LogSummaryReq req) {
Page<LogSummary> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
List<LogSummary> logSummaryList=logSummaryMapper.RecordSumByOrderId(req,(req.getPageNo()-1)*req.getPageSize(), req.getPageSize());
public PageResult<LogSummaryDto> RecordSumByOrderId(LogSummaryReq req) {
Page<LogSummaryDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
List<LogSummaryDto> logSummaryList=logSummaryMapper.RecordSumByOrderId(req,(req.getPageNo()-1)*req.getPageSize(), req.getPageSize());
int size=logSummaryMapper.RecordSumByOrderIdSum(req);
page.setTotal(size);
page.setRecords(logSummaryList);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
......@@ -992,8 +992,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
//判断传递的订单主id是否存在
OrderMain orderMain = orderMainExist(req.getId());
String orgName=orderMain.getOrderType().equals("in") ? orderMain.getEndOrgName() : orderMain.getStartOrgName();
List<Warehouse> warehouseList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getOrgIdInt,
orderMain.getOrderType().equals("in") ? orderMain.getEndOrgId() : orderMain.getStartOrgId()));
Long orgId=orderMain.getOrderType().equals("in") ? orderMain.getEndOrgId() : orderMain.getStartOrgId();
List<Warehouse> warehouseList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getOrgIdInt,orgId));
Map<String,Warehouse> warehouseMap=new HashMap<>();
warehouseList.forEach(warehouse -> warehouseMap.put(warehouse.getId(), warehouse));
LoginUser loginUser = LoginContext.getContext().getLoginUser();
......@@ -1114,15 +1114,16 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
logSummaryReq.setTypeName(logSummaryReq.getTypeName()+","+uploadDetailReq.getTypeName());
logMap.put(detailJsonReq.getLocationId(),logSummaryReq);
}else {
LogSummaryReq logSummaryReq = addLogSummary(loginUser,uploadDetailReq,detailJsonReq,subNum,orderMain);
LogSummaryReq logSummaryReq = addLogSummary(loginUser,uploadDetailReq,detailJsonReq,subNum,orderMain,orgId);
logMap.put(detailJsonReq.getLocationId(),logSummaryReq);
}
//实际出库或者入库数量大于实际数量，则对空数据进行增删改查
if (orderMain.getOrderType().equals("in")){ //入库
Random random = new Random();
for (InventoryReq inv:detailJsonReq.getInfoList()) {
String epc="000000"+DateTimeUtil.getCurrentDateTime().getTime()+random.nextInt(999999 - 100000 + 1) + 100000;
Inventory inventory = new Inventory();
inventory.setEpc("000000"+DateTimeUtil.getCurrentDateTime().getTime()+random.nextInt(999999 - 100000 + 1) + 100000);
inventory.setEpc(epc);
inventory.setLocationId(detailJsonReq.getLocationId());
inventory.setSizeId(ObjectUtil.isNull(detailJsonReq.getSizeId())? uploadDetailReq.getSizeId():detailJsonReq.getSizeId());
inventory.setTypeId(ObjectUtil.isNull(detailJsonReq.getTypeId())? uploadDetailReq.getTypeId():detailJsonReq.getTypeId());
......@@ -1130,6 +1131,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
inventory.setLocationType(0);
inventory.setPrice(ObjectUtil.isNull(detailJsonReq.getPrice())?price:detailJsonReq.getPrice());
inventory.setProperty(0);
inventory.setState("normal");
inventory.setBussinessState("normal");
inventory.setCreateTime(DateTimeUtil.getCurrentDateTime());
inventory.setProductionDate(inv.getProductionDate());
inventory.setWarrantyPeriod(inv.getWarrantyPeriod());
......@@ -1140,7 +1143,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
addInvList.add(inventory);
WarehouseInventory warehouseInventory = new WarehouseInventory();
warehouseInventory.setOrgId(orderMain.getEndOrgId());
warehouseInventory.setEpc("000000"+DateTimeUtil.getCurrentDateTime().getTime()+random.nextInt(999999 - 100000 + 1) + 100000);
warehouseInventory.setEpc(epc);
warehouseInventory.setLocationId(detailJsonReq.getLocationId());
warehouseInventory.setTypeId(ObjectUtil.isNull(detailJsonReq.getTypeId())? uploadDetailReq.getTypeId():detailJsonReq.getTypeId());
warehouseInventory.setSizeId(ObjectUtil.isNull(detailJsonReq.getSizeId())? uploadDetailReq.getSizeId():detailJsonReq.getSizeId());
......@@ -1263,13 +1266,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
boolean c = saveAccountingLog(req, s, updateQuantity);
//修改装备汇总表中的数据 inventory_summary
Long orgId;
if (orderMain.getOrderType().equals("in")){
orgId=orderMain.getEndOrgId();
}
else {
orgId=orderMain.getStartOrgId();
}
PubOrg pubOrg = pubOrgService.PubOrgExist(orgId);
boolean d = true;
//如果是快速移库，记账完成之后新增入库单并且该单据不走审核流，但是审核状态和入库状态显示已完成
......@@ -1333,9 +1330,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
return (a && b && c && d && e && f && g);
}
private LogSummaryReq addLogSummary(LoginUser loginUser,UpdateOrderDetailReq uploadDetailReq,DetailJsonReq detailJsonReq,Integer subNum,OrderMain orderMain){
private LogSummaryReq addLogSummary(LoginUser loginUser,UpdateOrderDetailReq uploadDetailReq,DetailJsonReq detailJsonReq,Integer subNum,OrderMain orderMain,Long orgId){
LogSummaryReq logSummaryReq = new LogSummaryReq();
logSummaryReq.setOrgId(uploadDetailReq.getOrgId());
logSummaryReq.setOrgId(orgId);
logSummaryReq.setBussinessType(orderMain.getBussinessType());
logSummaryReq.setOrgName(loginUser.getOrgName());
logSummaryReq.setOrderMainId(orderMain.getId());
logSummaryReq.setOrderCode(orderMain.getOrderCode());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -1641,6 +1641,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
Policeman one = getOne(new LambdaQueryWrapper<Policeman>().eq(Policeman::getUserId, req.getUserId()));
if (ObjectUtil.isNotNull(one)){
eq.eq(PoliceEquipment::getPoliceId, one.getId())
.eq(ObjectUtil.isNotNull(req.getTypeId()),PoliceEquipment::getTypeId,req.getTypeId())
.eq(ObjectUtil.isNotNull(req.getSizeId()),PoliceEquipment::getSizeId,req.getSizeId())
.like(ObjectUtil.isNotNull(req.getTypeName()),PoliceEquipment::getTypeName,req.getTypeName())
.like(ObjectUtil.isNotNull(req.getSizeName()),PoliceEquipment::getSizeName,req.getSizeName())
.last("order by "+req.getColumn()+ " "+req.getOrder());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/StocktakeServiceImpl.java
package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -35,6 +36,8 @@ import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
import static org.checkerframework.checker.units.qual.Prefix.one;
/**
* @author lxh专属坐骑
* @description 针对表【bussiness_stocktake】的数据库操作Service实现
......@@ -182,10 +185,15 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
.eq(SysDictItem::getItemText, bussinessType)
.eq(SysDictItem::getDictId,sysDictId)).getItemValue();
orderNum.setBussinessType(itemValue);
OrderNum one = orderNumService.getOne(new LambdaQueryWrapper<OrderNum>()
List<OrderNum> list = orderNumService.list(new LambdaQueryWrapper<OrderNum>()
.eq(OrderNum::getOrgId, orderNum.getOrgId())
.eq(OrderNum::getBussinessType, orderNum.getBussinessType())
.eq(OrderNum::getYear, orderNum.getYear()));
OrderNum one = new OrderNum();
if (CollectionUtil.isNotEmpty(list)){
one=list.get(0);
}
//设置num的数量
if (ObjectUtil.isNull(one)){
orderNum.setNum(1);
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
......@@ -663,7 +663,7 @@
</select>
<select id="EqsByStateSum" resultType="java.lang.Integer">
select count(*) from (
select t.* ,et.name as type_name,es.name as size_name FROM(
select
a.*,i.state,i.bussiness_state,i.production_date,i.warranty_period,i.maintenance_period,i.fix_count,i.price,i.property
from
......@@ -681,13 +681,10 @@
<if test="req.state == 'broken'">
and i.state = "broken" and i.location_state = "in"
</if>
) as t
join base_equipment_type et on t.type_id=et.id
join base_equipment_size es on es.id=t.size_id
)as b
</select>
<select id="EqsByState" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
select t.* ,et.name as type_name,es.name as size_name FROM(
select
a.*,i.state,i.bussiness_state,i.production_date,i.warranty_period,i.maintenance_period,i.fix_count,i.price,i.property
from
......@@ -708,9 +705,6 @@
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize}
</if>
) as t
join base_equipment_type et on t.type_id=et.id
join base_equipment_size es on es.id=t.size_id
</select>
......
jyzb-biz/src/main/resources/mapper/LogDetailMapper.xml
......@@ -40,11 +40,17 @@
</select>
<select id="ShowInOutRecordsByOrder" resultType="com.junmp.jyzb.api.bean.dto.LogDetailDto">
select a.*,ls.location_name,ls.order_main_id,ls.out_in_state FROM (
select ld.* FROM base_log_detail ld
where type_id=#{typeId} and size_id=#{sizeId}
) as a
join base_log_summary ls on ls.id=a.summary_id and ls.order_main_id=#{orderMainId}
select
GROUP_CONCAT(DISTINCT ls.location_name SEPARATOR ',') AS location_name,
GROUP_CONCAT(DISTINCT ls.use_time SEPARATOR ',') AS create_time,
GROUP_CONCAT(DISTINCT ls.user_name SEPARATOR ',') as user_name,
GROUP_CONCAT(DISTINCT ls.device_type SEPARATOR ',') as device_type,
count(*) as number FROM (
select ld.summary_id FROM base_log_detail ld
where type_id=#{typeId} and size_id=#{sizeId}
) as a
join base_log_summary ls on ls.id=a.summary_id and ls.order_main_id=#{orderMainId}
GROUP BY location_id
</select>
<select id="getInOutRecordsSize" resultType="java.lang.Integer" parameterType="java.lang.String">
select count(*) FROM(
......
jyzb-biz/src/main/resources/mapper/LogSummaryMapper.xml
......@@ -127,7 +127,7 @@
</if>
) as a
</select>
<select id="RecordSumByOrderId" resultType="com.junmp.jyzb.entity.LogSummary">
<select id="RecordSumByOrderId" resultType="com.junmp.jyzb.api.bean.dto.LogSummaryDto">
(SELECT
t.bussiness_type AS bussiness_type,
t.order_code AS order_code,
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
......@@ -582,7 +582,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
//装备名称
if (ObjectUtil.isNotNull(taskDTO.getTypeName()) && ! taskDTO.getTypeName().trim().isEmpty()){
historicTaskQuery=historicTaskQuery.processVariableValueLike(INVLIST,taskDTO.getTypeName());
historicTaskQuery=historicTaskQuery.processVariableValueLike(INVLIST,"%"+taskDTO.getTypeName()+"%");
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论