Skip to content

J
jyzb_platformV2
Commit a49a87cb by 李小惠
Options

添加存储过程参数

parent c451fa34
正在显示 包含 58 行增加 和 56 行删除
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java
......@@ -58,11 +58,11 @@ public class TjController {
/**
* 根据组织机构统计装备的报表数据（外层数据）
*/
@PostMapping("/GetTjData")
@ApiOperation("/装备统计报表")
public ApiRes<PageResult<TjOrgEqsDto>> GetTjData(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.GetTjData(req));
}
@PostMapping("/GetTjData")
@ApiOperation("/装备统计报表")
public ApiRes<PageResult<TjOrgEqsDto>> GetTjData(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.GetTjData(req));
}
@PostMapping("/TjOrgDataSum")
@ApiOperation("/装备统计报表汇总")
......
jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java
......@@ -122,7 +122,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
String Type= typeOrder.get(0).getValue().toString();
if (Type.equals("workOrder") )//出入库单据
if (Type.equals("workOrder") || Type.equals("quickOrder"))//出入库单据
{
OrderMain existOrder= orderMainService.getOne(new LambdaQueryWrapper<OrderMain>()
.eq(OrderMain::getProcessId, processInstanceId));
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/DeviceConfigMapper.java
......@@ -22,7 +22,6 @@ public interface DeviceConfigMapper extends BaseMapper<DeviceConfig> {
int showDeviceConfigCount(@Param("req") QueryDeviceConfigReq req);
List<DeviceConfig> showDeviceConfig(@Param("orgId") Long orgId,
@Param("deviceType") Integer deviceType,
@Param("deviceName") String deviceName,
@Param("deviceCode") String deviceCode,
@Param("pageNo") Long pageNo,
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
......@@ -47,7 +47,7 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
List<TjOrgEqsDto> test(@Param("req") InventoryReq req);
TjOrgEqsDto GetInvSum(@Param("orgId") String orgId,@Param("typeId") String typeId,@Param("sizeName") String sizeName);
TjOrgEqsDto GetSumLeve4(@Param("orgId") String orgId,@Param("typeId") String typeId,@Param("sizeName") String sizeName);
TjOrgEqsDto GetSumLeve4(@Param("orgId") String orgId,@Param("typeId") String typeId,@Param("sizeName") String sizeName,@Param("sql") String sql);
List<TjOrgEqsDto> selectDynamicView();
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/DeviceConfigServiceImpl.java
......@@ -65,7 +65,7 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
req.setPageNo(1L);
req.setPageSize(10L);
}
List<DeviceConfig> list=deviceConfigMapper.showDeviceConfig(req.getOrgId(),req.getDeviceType(),req.getDeviceName(),
List<DeviceConfig> list=deviceConfigMapper.showDeviceConfig(req.getOrgId(),req.getDeviceName(),
req.getDeviceCode(),(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
Page<DeviceConfig> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
page.setTotal(size);
......@@ -75,7 +75,7 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
@Override
public List<DeviceConfig> showDeviceConfigList(QueryDeviceConfigReq req) {
List<DeviceConfig> list=deviceConfigMapper.showDeviceConfig(req.getOrgId(),req.getDeviceType(),req.getDeviceName(),
List<DeviceConfig> list=deviceConfigMapper.showDeviceConfig(req.getOrgId(),req.getDeviceName(),
req.getDeviceCode(),null,null);
return list;
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderCommonServiceImpl.java
......@@ -31,7 +31,7 @@ import java.util.List;
import java.util.Map;
import static com.junmp.junmpProcess.common.CommonConstants.BUSSINESS_TYPE;
import static com.junmp.junmpProcess.common.CommonConstants.ORDER_TYPE;
import static com.junmp.junmpProcess.common.CommonConstants.TYPE_ORDER;
@Service
public class OrderCommonServiceImpl implements OrderCommonService {
......@@ -67,7 +67,7 @@ public class OrderCommonServiceImpl implements OrderCommonService {
// Map<String, Object> processVariables = task.getProcessVariables();
//单据类型（出入库单、调岗单、业务单、盘库单）
// String orderType = MapUtil.getStr(processVariables, ORDER_TYPE);
String orderType= MapUtil.getStr(processInstance.getProcessVariables(),ORDER_TYPE);
String orderType= MapUtil.getStr(processInstance.getProcessVariables(),TYPE_ORDER);
//单据业务类型（采购啥的......）
String bussinessType= MapUtil.getStr(processInstance.getProcessVariables(),BUSSINESS_TYPE);
// String bussinessType = MapUtil.getStr(processVariables, BUSSINESS_TYPE);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
......@@ -124,7 +124,8 @@ public class TjServiceImpl implements TjService {
@Override
public PageResult<TjOrgEqsDto> GetTjData(TjOrgEqsReq req) {
// String sql=" SUBSTRING(`po`.`org_code`, 5, 2) = '00' ";
String sql=" 1=1 ";
//先拿到符合条件的组织机构，再遍历组织机构组成数据
//（下一层数据组织机构数据）
List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
......@@ -140,7 +141,7 @@ if (req.getOrgId()!=1369509498032808905L)
{
TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString(),sql);
allData.add(OrgData);//把本级数据加进去
}
//查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除
......@@ -169,6 +170,8 @@ if (req.getOrgId()!=1369509498032808905L)
@Override
public FinalTjOrgEqsDto TjOrgDataSum(TjOrgEqsReq req) {
String sql=" 1=1 ";
// String sql=" SUBSTRING(`po`.`org_code`, 5, 2) = '00' ";
FinalTjOrgEqsDto finalTjOrgEqsDto = new FinalTjOrgEqsDto();
finalTjOrgEqsDto.setTotalNumber(0);
finalTjOrgEqsDto.setCkStockNumber(0);
......@@ -188,7 +191,7 @@ if (req.getOrgId()!=1369509498032808905L)
{
TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString(),sql);
allData.add(OrgData);//把本级数据加进去
}
for (TjOrgEqsDto tj:allData) {
......@@ -255,46 +258,46 @@ if (req.getOrgId()!=1369509498032808905L)
@Override
public FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req) {
//先拿到符合条件的组织机构，再遍历组织机构组成数据
List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
List<TjOrgEqsDto> allData=new ArrayList<>();
for (String orgId:orgList) {
TjOrgEqsDto OrgData=inventorySummaryMapper.GetInvSum( orgId,
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
allData.add(OrgData);
}
if (!req.getOrgId().equals("1369509498032808905"))
{
TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
allData.add(OrgData);//把本级数据加进去
}
// List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
// List<TjOrgEqsDto> allData=new ArrayList<>();
// for (String orgId:orgList) {
//
// TjOrgEqsDto OrgData=inventorySummaryMapper.GetInvSum( orgId,
// req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
// req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
// allData.add(OrgData);
// }
// if (!req.getOrgId().equals("1369509498032808905"))
// {
// TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
// req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
// req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
// allData.add(OrgData);//把本级数据加进去
// }
FinalTjOrgEqsDto dto=new FinalTjOrgEqsDto();
Integer totalNumber = 0;
Integer ckStockNumber = 0;
Integer djgStockNumber = 0;
Integer ckOutboundNumber = 0;
Integer djgOutboundNumber = 0;
Integer destructionNumber = 0;
for (TjOrgEqsDto dtodata :allData) {
totalNumber += dtodata.getTotalNumber();
ckStockNumber += dtodata.getCkStockNumber();
djgStockNumber += dtodata.getDjgStockNumber();
ckOutboundNumber += dtodata.getCkOutboundNumber();
djgOutboundNumber += dtodata.getDjgOutboundNumber();
destructionNumber += dtodata.getDestructionNumber();
}
// 将累加后的值设置到 FinalTjOrgEqsDto
dto.setTotalNumber(totalNumber);
dto.setCkStockNumber(ckStockNumber);
dto.setDjgStockNumber(djgStockNumber);
dto.setCkOutboundNumber(ckOutboundNumber);
dto.setDjgOutboundNumber(djgOutboundNumber);
dto.setDestructionNumber(destructionNumber);
// Integer totalNumber = 0;
// Integer ckStockNumber = 0;
// Integer djgStockNumber = 0;
// Integer ckOutboundNumber = 0;
// Integer djgOutboundNumber = 0;
// Integer destructionNumber = 0;
//
// for (TjOrgEqsDto dtodata :allData) {
// totalNumber += dtodata.getTotalNumber();
// ckStockNumber += dtodata.getCkStockNumber();
// djgStockNumber += dtodata.getDjgStockNumber();
// ckOutboundNumber += dtodata.getCkOutboundNumber();
// djgOutboundNumber += dtodata.getDjgOutboundNumber();
// destructionNumber += dtodata.getDestructionNumber();
// }
//
// // 将累加后的值设置到 FinalTjOrgEqsDto
// dto.setTotalNumber(totalNumber);
// dto.setCkStockNumber(ckStockNumber);
// dto.setDjgStockNumber(djgStockNumber);
// dto.setCkOutboundNumber(ckOutboundNumber);
// dto.setDjgOutboundNumber(djgOutboundNumber);
// dto.setDestructionNumber(destructionNumber);
return dto;
}
......
jyzb-biz/src/main/resources/mapper/DeviceConfigMapper.xml
......@@ -32,7 +32,7 @@
select dc.*,po.org_name as org_name,bw.name as location_name from base_device_config dc
join pub_org po on po.org_id=dc.org_id
left join base_warehouse bw on bw.id=dc.location_id
where dc.org_id =#{orgId} and dc.device_type=#{deviceType}
where dc.org_id =#{orgId}
<if test="deviceName != null and deviceName != ''">
and dc.device_name =#{deviceName}
</if>
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
......@@ -338,7 +338,7 @@
{CALL GetInventorySummary(#{orgId,mode=IN},#{typeId,mode=IN},#{sizeName,mode=IN})}
</select>
<select id="GetSumLeve4" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto" statementType="CALLABLE">
{CALL GetSumLeve4(#{orgId,mode=IN},#{typeId,mode=IN},#{sizeName,mode=IN})}
{CALL GetSumLeve4(#{orgId,mode=IN},#{typeId,mode=IN},#{sizeName,mode=IN},#{sql,mode=IN})}
</select>
<select id="selectDynamicView" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto">
SELECT * FROM dynamic_view
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论