Skip to content

J
jyzb_platformV2
Commit 796f44fd by 李小惠
Options

Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh 

# Conflicts:
#	jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
parents b7cbd956 2cac5a6e
正在显示 包含 80 行增加 和 19 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/BussinessInventoryDto.java
......@@ -11,6 +11,7 @@ import java.util.List;
public class BussinessInventoryDto implements Serializable {
private String id;
private String rules;
private String rulesText;
private String totalNum;
private String actualNum;
private String addNum;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InvSummaryDto.java
......@@ -6,9 +6,11 @@ import java.math.BigDecimal;
@Data
public class InvSummaryDto {
private String id;
private String typeId;
private String sizeId;
private String locationId;
private Integer count;
private BigDecimal price;
private String epc;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/BussinessInventoryReq.java
......@@ -14,6 +14,7 @@ public class BussinessInventoryReq {
private String inventoryState;
private String examineState;
private String type;
private String result;
private String typeList;
private String orgId;
private String orderState;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java
......@@ -27,6 +27,9 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
List<WarehouseInvDto> GetViewWarehouseInv(@Param("warehouseId") String warehouseId,@Param("typeIdsList") List<String> typeIdsList,@Param("sizeIds") List<String> sizeIds);
List<ViewEquipmentDto> GetViewEquipment(@Param("epcList") List<String> epcList);
List<EpcListDto> GetViewCountByepcs(@Param("epcList") List<String> epcList);
List<InvSummaryDto> selectEpcsByWarehouse(@Param("warehouseId") String warehouseId,
@Param("typeIdList")List<String> typeIdList,
@Param("sizeIdList")List<String> sizeIdList);
List<InventoryMapDto> GetViewInventoryMap(@Param("warehouseId") String warehouseId);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java
......@@ -466,6 +466,26 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
@Override
public BussinessInventoryDto GetDetailById(BussinessInventoryReq req) {
BussinessInventory inventory= this.getById(req.getOrderId());
String rules="盘点规则-";
if (inventory.getInventoryType().equals(1))//按装备类型盘点
{
QueryEquipmentTypeReq typeReq=new QueryEquipmentTypeReq();
typeReq.setTypeIds(inventory.getRules());
String types= equipmentTypeService.GetEquipmentByIds(typeReq);
rules=rules+"类别盘点:"+types;
} else if (inventory.getInventoryType().equals(2))//按装备号型盘点
{
QueryEquipmentTypeReq typeReq=new QueryEquipmentTypeReq();
typeReq.setSizeIds(inventory.getRules());
String sizes= equipmentTypeService.GetEquipmentBySizeIds(typeReq);
rules=rules+"类别及号型盘点:"+sizes;
}
else
{
rules=rules+"整库盘点";
}
List<InventoryDetailDto> detailsMain= bussinessInventoryMapper.GetBussinessInventoryMap(req.getOrderId());
List<BussinessDetail> detailsChildren = bussinessInventoryDetailService.list(
new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId())
......@@ -473,6 +493,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
List<EquipmentListDto> eqDtoList=new ArrayList<>();
BussinessInventoryDto BIDTO=new BussinessInventoryDto();
BIDTO.setRulesText(rules);
BeanPlusUtil.copyProperties(inventory,BIDTO);
for (InventoryDetailDto detail : detailsMain) {
EquipmentListDto eqDto = new EquipmentListDto();
......@@ -633,7 +654,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
if(req.getState().equals("0"))//确认结果
{
Map<String, Object> params = new HashMap<>();
List<WarehouseInventory> DeleteList;
// List<WarehouseInventory> DeleteList;
List<WarehouseInventory> SaveEpcList =new ArrayList<>();
List<BussinessDetail> bussinessDetail = bussinessInventoryDetailService.list(
new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId())
......@@ -725,7 +746,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
}
LambdaQueryWrapper<WarehouseInventory> queryWrapper = new LambdaQueryWrapper<>();
// LambdaQueryWrapper<WarehouseInventory> queryWrapper = new LambdaQueryWrapper<>();
params.put("warehouseId", BI.getWarehouseId()); // 添加一个空的列表
// 从Map中获取sizeIds，假设它们存储为List类型
List<String> sizeIds = (List<String>) params.get("sizeIds");
......@@ -733,20 +754,20 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
List<String> typeIds = (List<String>) params.get("typeIds");
// 检查sizeIds是否不为空且不是空列表
if (sizeIds != null && !sizeIds.isEmpty()) {
queryWrapper.in(WarehouseInventory::getSizeId, sizeIds);
// queryWrapper.in(WarehouseInventory::getSizeId, sizeIds);
}
// 检查sizeIds是否不为空且不是空列表
if (typeIds != null && !typeIds.isEmpty()) {
queryWrapper.in(WarehouseInventory::getTypeId, typeIds);
// queryWrapper.in(WarehouseInventory::getTypeId, typeIds);
}
// 添加查询条件，仅查询warehouseId为111的记录
queryWrapper.eq(WarehouseInventory::getLocationId, BI.getWarehouseId());
DeleteList = warehouseInventoryService.list(queryWrapper);
// // 添加查询条件，仅查询warehouseId符合的记录
// queryWrapper.eq(WarehouseInventory::getLocationId, BI.getWarehouseId());
// DeleteList = warehouseInventoryService.list(queryWrapper);
List<InvSummaryDto> invDelete= inventoryMapper.selectEpcsByWarehouse(BI.getWarehouseId(),typeIds,sizeIds);
List<String> removeIds = invDelete.stream() // 创建流
.map(InvSummaryDto::getId) // 提取每个InvSummaryDto对象的id
.collect(Collectors.toList()); // 收集到列表中
// 检查sizeIds是否不为空且不是空列表
if (sizeIds != null && !sizeIds.isEmpty()) {
queryWrapper.in(WarehouseInventory::getSizeId, sizeIds);
}
List<WarehouseInvDto> DeleteFakeEpc = inventoryMapper.GetViewWarehouseInv(BI.getWarehouseId(), typeIds, sizeIds);
......@@ -863,12 +884,12 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
}
//同组织机构当前仓库需要增加价格和数量
InventorySumReq summaryNowReq=new InventorySumReq();
summaryNowReq.setLocationId(BI.getWarehouseId());
summaryNowReq.setUnitPrice(String.valueOf(Isum.getPrice()));
summaryNowReq.setTypeId(Isum.getTypeId());
summaryNowReq.setSizeId(Isum.getSizeId());
// //同组织机构当前仓库需要增加价格和数量
// InventorySumReq summaryNowReq=new InventorySumReq();
// summaryNowReq.setLocationId(BI.getWarehouseId());
// summaryNowReq.setUnitPrice(String.valueOf(Isum.getPrice()));
// summaryNowReq.setTypeId(Isum.getTypeId());
// summaryNowReq.setSizeId(Isum.getSizeId());
}
List<ViewEquipmentDto> viewEd= inventoryMapper.GetViewEquipment(UpdateInventorys);
for (ViewEquipmentDto inv:viewEd
......@@ -896,9 +917,13 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
BI.setUpdateTime(DateTimeUtil.getCurrentDateTime());
//删除同组织机构下该EPC其他仓库的位置信息
inventoryMapper.DeleteEpcsWithoutWarehouse(UpdateInventorys, String.valueOf(BI.getOrgId()),String.valueOf(BI.getWarehouseId()));
if (DeleteList.size()>0)//删除库内全部的EPC信息
// if (DeleteList.size()>0)//删除库内全部的EPC信息
// {
// warehouseInventoryService.removeBatchByIds(DeleteList);
// }
if (removeIds.size()>0)//删除库内全部的EPC信息
{
warehouseInventoryService.removeBatchByIds(DeleteList);
warehouseInventoryService.removeByIds(removeIds);
}
if (DeleteSummary.size()>0)
......@@ -1046,6 +1071,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
wrapper.eq(BussinessInventory::getResult, req.getResult());
wrapper.eq(BussinessInventory::getOrgId, req.getOrgId());
wrapper.eq(ObjectUtil.isNotNull(req.getResult())&& !req.getResult().equals("all") ,BussinessInventory::getResult,req.getResult());
wrapper.eq(StringUtils.isNotBlank(req.getWarehouseId()), BussinessInventory::getWarehouseId, req.getWarehouseId());
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
......@@ -141,6 +141,33 @@
AND bwi.location_id != #{warehouseId}
</delete>
<select id="selectEpcsByWarehouse" resultType="com.junmp.jyzb.api.bean.dto.InvSummaryDto">
SELECT
bi.epc,
bi.type_id as typeId,
bi.size_id as sizeId,
bwi.id as id,
bwi.location_id as locationId,
bi.price
FROM
`base_inventory` `bi`
JOIN
`base_warehouse_inventory` `bwi` ON `bi`.`epc` = `bwi`.`epc`
WHERE bwi.location_id=#{warehouseId} and bi.state!="destory"
<if test="typeIdList!=null and typeIdList.size() > 0">
AND bi.type_id IN
<foreach collection="typeIdList " item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeIdList != null and sizeIdList.size() > 0">
AND bi.size_id IN
<foreach item="item" collection="sizeIdList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="selectWarehouseByEpcs" resultType="com.junmp.jyzb.api.bean.dto.InvSummaryDto">
SELECT
......@@ -158,6 +185,7 @@
open="(" separator="," close=")">
#{item}
</foreach>
and bwi.org_id=#{orgId} and bwi.location_id!=#{warehouseId}
GROUP BY
bi.size_id, bi.type_id, bi.price,bwi.location_id
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论