wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

style(flowable): 优化流程相关代码的import顺序和代码结构

Browse Source
This commit is contained in:
chenqi
2025-12-30 15:11:32 +08:00
parent 54cde91aac
commit d1670b79a0
2528 changed files with 7710 additions and 10794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialCommonService.java
View File

@@ -1,11 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import javax.servlet.http.HttpServletRequest;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseSearchParam;
import javax.servlet.http.HttpServletRequest;
/**
* 物资共通方法

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialProfitLossOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资损益单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialPurchaseOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资订货单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReceiptApprovalService.java
View File

@@ -1,11 +1,11 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.inventorymanage.dto.ItemChargeDetailDto;
import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
import java.util.List;
/**
* 物资审批方法
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资退货单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialReturnToWarehouseOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资退库单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockInOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资进货单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStockOutOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资出库单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialStocktakingOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资盘点单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferInOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资调入单
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/IMaterialTransferOutOrderService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.materialmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import java.util.List;
/**
* 物资调出单
*

60
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialCommonServiceImpl.java
View File

@@ -1,5 +1,34 @@
package com.openhis.web.materialmanage.appservice.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.administration.domain.Organization;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.domain.Supplier;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.administration.service.IPractitionerService;
import com.openhis.administration.service.ISupplierService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.*;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.common.appservice.ICommonService;
import com.openhis.web.common.dto.LocationDto;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto;
import com.openhis.web.materialmanage.dto.MaterialDto;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -7,37 +36,6 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.openhis.administration.domain.Organization;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.common.enums.*;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.domain.Supplier;
import com.openhis.administration.service.IPractitionerService;
import com.openhis.administration.service.ISupplierService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.common.appservice.ICommonService;
import com.openhis.web.common.dto.LocationDto;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.dto.MaterialDto;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
/**
* 物资共通
*

19
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialProfitLossOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.web.materialmanage.mapper.MaterialProfitLossOrderMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资损益单

17
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialPurchaseOrderServiceImpl.java
View File

@@ -1,14 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -23,9 +14,15 @@ import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.web.materialmanage.mapper.MaterialPurchaseOrderMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资订货单

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.common.core.domain.R;
@@ -46,6 +36,14 @@ import com.openhis.yb.dto.MedicalInventory3501Param;
import com.openhis.yb.dto.MedicalInventory3502Param;
import com.openhis.yb.dto.MedicalPurchase3504Param;
import com.openhis.yb.service.YbManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
/**
* 物资审批

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资退货单

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialReturnToWarehouseOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资退库单

19
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockInOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.web.materialmanage.mapper.MaterialStockInOrderMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资进货单

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStockOutOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资出库单

19
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialStocktakingOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderServic
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.web.materialmanage.mapper.MaterialStocktakingOrderMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资盘点单

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferInOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -27,6 +17,14 @@ import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资调入单

19
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/appservice/impl/MaterialTransferOutOrderServiceImpl.java
View File

@@ -1,15 +1,5 @@
package com.openhis.web.materialmanage.appservice.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.utils.AssignSeqUtil;
@@ -25,9 +15,16 @@ import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderServic
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialInitDto;
import com.openhis.web.materialmanage.mapper.MaterialCommonMapper;
import com.openhis.web.materialmanage.mapper.MaterialTransferOutOrderMapper;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.service.ISupplyRequestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 物资调出单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialProfitLossOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialProfitLossOrderService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资损益单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialPurchaseOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialPurchaseOrderService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资订货单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.appservice.IMaterialReturnOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资退货单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialReturnToWarehouseOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.appservice.IMaterialReturnToWarehouseOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资退库单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockInOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.appservice.IMaterialStockInOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资进货单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStockOutOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.appservice.IMaterialStockOutOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资出库单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialStocktakingOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.appservice.IMaterialStocktakingOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资盘点单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferInOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.appservice.IMaterialTransferInOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资调入单

16
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/controller/MaterialTransferOutOrderController.java
View File

@@ -1,23 +1,19 @@
package com.openhis.web.materialmanage.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.SupplyType;
import com.openhis.web.materialmanage.appservice.IMaterialCommonService;
import com.openhis.web.materialmanage.appservice.IMaterialReceiptApprovalService;
import com.openhis.web.materialmanage.appservice.IMaterialTransferOutOrderService;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 物资调出单

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDetailDto.java
View File

@@ -3,21 +3,20 @@
*/
package com.openhis.web.materialmanage.dto;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 单据详细信息
*

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDeviceInfoDto.java
View File

@@ -3,19 +3,18 @@
*/
package com.openhis.web.materialmanage.dto;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 物资信息
*

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialDto.java
View File

@@ -3,17 +3,16 @@
*/
package com.openhis.web.materialmanage.dto;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 单据信息
*

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialInitDto.java
View File

@@ -3,17 +3,16 @@
*/
package com.openhis.web.materialmanage.dto;
import java.io.Serializable;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.administration.domain.Organization;
import com.openhis.web.common.dto.LocationDto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List;
/**
* 单据初期信息
*

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/dto/MaterialSearchParam.java
View File

@@ -3,14 +3,13 @@
*/
package com.openhis.web.materialmanage.dto;
import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 单据查询条件
*

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/materialmanage/mapper/MaterialCommonMapper.java
View File

@@ -1,15 +1,14 @@
package com.openhis.web.materialmanage.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.openhis.web.materialmanage.dto.MaterialDetailDto;
import com.openhis.web.materialmanage.dto.MaterialDto;
import com.openhis.web.materialmanage.dto.MaterialDeviceInfoDto;
import com.openhis.web.materialmanage.dto.MaterialDto;
import com.openhis.web.materialmanage.dto.MaterialSearchParam;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
/**
* 物资共通 mapper