diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/WareHouseApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/WareHouseApi.java index 2adae817..90ad810c 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/WareHouseApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/WareHouseApi.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; /** - * 仓库类服务指令工单 + * 库房类服务指令工单 */ @RestController @RequestMapping("/api/pad/warehouse") @@ -23,7 +23,7 @@ public class WareHouseApi { @Autowired private IDirectiveOrderApi directiveOrderApi; - @ApiOperation(value = "仓库类服务指令工单-查询工单信息", notes = "仓库类服务指令工单-查询工单信息") + @ApiOperation(value = "库房类服务指令工单-查询工单信息", notes = "库房类服务指令工单-查询工单信息") @GetMapping(value = "/queryOrderList") public Result queryCareList(DirectiveOrderEntity dto, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java index 75ffcbc5..b57ecf3e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java @@ -379,7 +379,7 @@ public class CareDirectiveApi { result.put("yll", ylResult); } - //仓库类 + //库房类 if (("," + dto.getQueryInstructionIds().trim() + ",").indexOf(",3,") != -1) { Map ckResult = Maps.newHashMap(); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/InvoicingDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/InvoicingDirectiveApi.java index f2ff0354..3150d89a 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/InvoicingDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/InvoicingDirectiveApi.java @@ -13,7 +13,7 @@ import java.util.Map; /** -* @Description: 仓库类服务指令计划API +* @Description: 库房类服务指令计划API * @Author: caolei * @Date: 2025-11-28 * @Version: V1.0 @@ -31,7 +31,7 @@ public class InvoicingDirectiveApi { private IInvoicingDirectivePlanApi invoicingDirectivePlanApi; /** - * 获取仓库类服务指令树-配置数据 + * 获取库房类服务指令树-配置数据 * * @return */ diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/LogisticsDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/LogisticsDirectiveApi.java index 2660d267..52660bbf 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/LogisticsDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/LogisticsDirectiveApi.java @@ -34,7 +34,7 @@ public class LogisticsDirectiveApi { private ILogisticsDirectivePlanApi logisticsDirectivePlanApi; /** - * 获取仓库类服务指令树-配置数据 + * 获取库房类服务指令树-配置数据 * * @return */ diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index ad6fd296..5bb3a915 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -89,7 +89,7 @@ public class InvoicingApi { }else if(result.indexOf("2@")>-1){ return Result.error("您已有其他物料采购数据，采购总数量超出库存上限，请修改采购数量,剩余采购数量为：" + result.split("@")[1]); }else if("3".equals( result)){ - return Result.error("添加的物料配置错误，请检查物料是否在对应仓库里！"); + return Result.error("添加的物料配置错误，请检查物料是否在对应库房里！"); }else if("4".equals( result)){ return Result.error("购物车最大数量为"+maxCount+"，采购数量超出限制"); }else if(result.indexOf("5@")>-1){ @@ -291,7 +291,7 @@ public class InvoicingApi { } - @ApiOperation(value="采购单-获取物料分类树可采购的物料数量（仓库列表使用）", notes="采购单-获取物料分类树可采购的物料数量（仓库列表使用）") + @ApiOperation(value="采购单-获取物料分类树可采购的物料数量（库房列表使用）", notes="采购单-获取物料分类树可采购的物料数量（库房列表使用）") @GetMapping(value = "/getTreeDataWlnum") public Result> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) { Map pageList = invoicingApi.getTreeDataWlnum(configMaterialCategory); @@ -398,7 +398,7 @@ public class InvoicingApi { return Result.error(pddMap.get("message").toString()); } if(StringUtils.isEmpty(cgdInfoEntityDto.getNuId())){ - return Result.error("请选择仓库"); + return Result.error("请选择库房"); } Integer maxCount = 100;//最大可添加数量 String result = invoicingApi.addWaringAll(cgdInfoEntityDto,maxCount); @@ -528,7 +528,7 @@ public class InvoicingApi { return Result.error("参数错误，请选择物料"); } if(StringUtils.isEmpty(crkInfoEntity.getNuId())){ - return Result.error("参数错误，请选择仓库"); + return Result.error("参数错误，请选择库房"); } IPage pageList = invoicingApi.queryCrkInfoList(pageNo, pageSize, crkInfoEntity,req); return Result.OK(pageList); @@ -543,7 +543,7 @@ public class InvoicingApi { return Result.error("参数错误，请选择物料"); } if(StringUtils.isEmpty(crkInfoEntity.getNuId())){ - return Result.error("参数错误，请选择仓库"); + return Result.error("参数错误，请选择库房"); } Map pageList = invoicingApi.queryCrkInfoNumList(pageNo, pageSize, crkInfoEntity,req); return Result.OK(pageList); @@ -551,7 +551,7 @@ public class InvoicingApi { /** - * 仓库-查询物料列表 + * 库房-查询物料列表 * @param materialInfoEntity * @param pageNo * @param pageSize diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 24bd9710..788eeee7 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -29,7 +29,7 @@ public class DirectiveOrderEntity implements Serializable { private String id; /**单号*/ private String orderNo; - /**工单类型 1护理;2医疗:3仓库;4行政*/ + /**工单类型 1护理;2医疗:3库房;4行政*/ private String orderType; /**执行类型 1单人 2协助 3转单*/ private String optType; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java index 2e063e6d..2b8ba391 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderInfoEntity.java @@ -20,7 +20,7 @@ public class DirectiveOrderInfoEntity implements Serializable { /**ID*/ private String id; - /**工单类型 1护理;2医疗:3仓库;4行政*/ + /**工单类型 1护理;2医疗:3库房;4行政*/ private String orderType; /**单号*/ private String orderNo; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java index cc25fe31..6f29f2ca 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesSalaryInfoEntity.java @@ -25,7 +25,7 @@ public class EmployeesSalaryInfoEntity implements Serializable { private String mainId; /**单号*/ private String orderNo; - /**工单类型 1护理;2医疗:3仓库;4行政*/ + /**工单类型 1护理;2医疗:3库房;4行政*/ private String orderType; /**护理单元ID，nu_base_info.id*/ @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java index a9aa1813..b64e8117 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 仓库类服务指令 + * @Description: 库房类服务指令 * @Author: caolei * @Date: 2025-11-28 * @Version: V1.0 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java index a166e296..05e6b557 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 仓库类服务指令即时指令 + * @Description: 库房类服务指令即时指令 * @Author: caolei * @Date: 2026-1-6 * @Version: V1.0 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddMainEntity.java index bbdbf7a3..39e6cbee 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddMainEntity.java @@ -60,7 +60,7 @@ public class InvoicingPddMainEntity implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date pddEndTime; - /**对应仓库*/ + /**对应库房*/ private String nuId; /**盘盈单数量 0是没有 其他是具体数字*/ private Integer pydNum; diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java index 55327985..20671665 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/salary/entity/EmployeesSalaryInfo.java @@ -46,9 +46,9 @@ public class EmployeesSalaryInfo implements Serializable { @Excel(name = "单号", width = 15) @ApiModelProperty(value = "单号") private java.lang.String orderNo; - /**工单类型 1护理;2医疗:3仓库;4行政*/ - @Excel(name = "工单类型 1护理;2医疗:3仓库;4行政", width = 15) - @ApiModelProperty(value = "工单类型 1护理;2医疗:3仓库;4行政") + /**工单类型 1护理;2医疗:3库房;4行政*/ + @Excel(name = "工单类型 1护理;2医疗:3库房;4行政", width = 15) + @ApiModelProperty(value = "工单类型 1护理;2医疗:3库房;4行政") private java.lang.String orderType; /**护理单元ID，nu_base_info.id*/ @Excel(name = "护理单元ID，nu_base_info.id", width = 15, dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddMain.java index 70bcd5a5..ec055429 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddMain.java @@ -88,13 +88,13 @@ public class NuInvoicingPddMain implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "盘点单完成时间") private java.util.Date pddEndTime; - /**对应仓库*/ - @Excel(name = "对应仓库", width = 15) - @ApiModelProperty(value = "对应仓库") + /**对应库房*/ + @Excel(name = "对应库房", width = 15) + @ApiModelProperty(value = "对应库房") private java.lang.String nuId; - /**仓库名称*/ - @Excel(name = "仓库名称", width = 15) - @ApiModelProperty(value = "仓库名称") + /**库房名称*/ + @Excel(name = "库房名称", width = 15) + @ApiModelProperty(value = "库房名称") private java.lang.String nuName; /**盘盈单数量 0是没有 其他是具体数字*/ @Excel(name = "盘盈单数量 0是没有 其他是具体数字", width = 15) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index 1163da79..62e250ea 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -639,8 +639,8 @@ public class QingLingServiceImpl implements IQinglingApi { * 2、请领单操作日志表增加操作记录 * 3、护理单元出入库日志 * 4、护理单元货品修改对应现有数量 - * 5、添加仓库出库记录 先找出对应物料的仓库库存即为操作前库存量 请领单对应物料数即为出入库数量 两个相减即为当前库存量 crk_type 2 crk_status 3 - * 6、修改仓库库存数量 当前的值 - 操作数量 + * 5、添加库房出库记录 先找出对应物料的库房库存即为操作前库存量 请领单对应物料数即为出入库数量 两个相减即为当前库存量 crk_type 2 crk_status 3 + * 6、修改库房库存数量 当前的值 - 操作数量 * * @param dto * @return。 @@ -765,7 +765,7 @@ public class QingLingServiceImpl implements IQinglingApi { }); } - //添加仓库出库记录 先找出对应物料的仓库库存即为操作前库存量 请领单对应物料数即为出入库数量 两个相减即为当前库存量 crk_type 2 crk_status 3 + //添加库房出库记录 先找出对应物料的库房库存即为操作前库存量 请领单对应物料数即为出入库数量 两个相减即为当前库存量 crk_type 2 crk_status 3 //库房物料数量 List kfnumList = warehouseMaterialInfoService.list(); Map> kfWlSlMap = kfnumList.stream() @@ -808,7 +808,7 @@ public class QingLingServiceImpl implements IQinglingApi { }); warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList); - //修改仓库库存数量 当前的值 - 操作数量 + //修改库房库存数量 当前的值 - 操作数量 Map qldWlNumMap = qldInfoList.stream() .collect(Collectors.toMap(NuInvoicingQldInfo::getWlId, NuInvoicingQldInfo::getQlNum)); List kfUpdateList = Lists.newArrayList(); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java index c397285c..f768037d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java @@ -225,13 +225,13 @@ public class BlWarehouseMaterialInfoController extends JeecgController addAllWuliao(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) { diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java index 053ec720..63258cb9 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java @@ -56,7 +56,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl list =baseMapper.getRemainingList(blWarehouseMaterialInfo); @@ -130,7 +130,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl pddMainList = pddMainMapper.selectPddWlsfzyList(wlId); if(pddMainList.size()>0){ - map.put("message","有仓库正在盘点单中，等盘点结束后再进行操作"); + map.put("message","有库房正在盘点单中，等盘点结束后再进行操作"); map.put("success",false); return map; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java index c0ce6f1e..68e228d5 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/service/impl/DirectiveAppraisalServiceImpl.java @@ -87,7 +87,7 @@ public class DirectiveAppraisalServiceImpl extends ServiceImpl result = service.generateDataPoolBatch(); log.error("DataPoolJob:{}-{}", DateUtils.now(),result.getMessage()); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml index 914b4137..404f4bbd 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml @@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS ${tableName} ( id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - pool_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据池类型 1护理;2医疗:3仓库;4行政', + pool_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据池类型 1护理;2医疗:3库房;4行政', biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_directive_plan.id;即时指令计划ID,nu_biz_nu_care_directive_plan_instant.id', nu_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '护理单元ID，nu_base_info.id', directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', @@ -156,7 +156,7 @@ CREATE TABLE IF NOT EXISTS ${tableName} ( id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', order_no varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - order_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '工单类型 1护理;2医疗:3仓库;4行政', + order_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '工单类型 1护理;2医疗:3库房;4行政', opt_type varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '执行类型 1单人 2协助 3转单', pool_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据池主表ID，nu_biz_nu_directive_data_pool.id', biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务单号，预留', diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IInvoicingDataPoolService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IInvoicingDataPoolService.java index ec14ef99..0ef35789 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IInvoicingDataPoolService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/IInvoicingDataPoolService.java @@ -7,7 +7,7 @@ import com.nu.modules.biz.plan.logistics.entity.LogisticsDirectivePlan; import org.jeecg.common.api.vo.Result; /** - * @Description: 服务指令数据池管理-仓库类 + * @Description: 服务指令数据池管理-库房类 * @Author: caolei * @Date: 2026-1-6 * @Version: V1.0 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java index c31ae076..ea0210a9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java @@ -17,7 +17,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 服务指令数据池管理-仓库类 + * @Description: 服务指令数据池管理-库房类 * @Author: caolei * @Date: 2026-1-6 * @Version: V1.0 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java index c6017667..8567d2e6 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrderInfo.java @@ -41,9 +41,9 @@ public class DirectiveOrderInfo implements Serializable { @Excel(name = "单号", width = 15) @ApiModelProperty(value = "单号") private java.lang.String orderNo; - /**工单类型 1护理;2医疗:3仓库;4行政*/ - @Excel(name = "工单类型 1护理;2医疗:3仓库;4行政", width = 15) - @ApiModelProperty(value = "工单类型 1护理;2医疗:3仓库;4行政") + /**工单类型 1护理;2医疗:3库房;4行政*/ + @Excel(name = "工单类型 1护理;2医疗:3库房;4行政", width = 15) + @ApiModelProperty(value = "工单类型 1护理;2医疗:3库房;4行政") private java.lang.String orderType; /**护理单元ID，nu_base_info.id*/ @Excel(name = "护理单元ID，nu_base_info.id", width = 15, dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java index cf895de1..7f5d1858 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java @@ -728,7 +728,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl