修改库房改成仓库
This commit is contained in:
parent
05c0773aec
commit
adb3848b52
|
|
@ -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<DirectiveOrderEntity> queryCareList(DirectiveOrderEntity dto,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
|
|
|
|||
|
|
@ -379,7 +379,7 @@ public class CareDirectiveApi {
|
|||
result.put("yll", ylResult);
|
||||
}
|
||||
|
||||
//仓库类
|
||||
//库房类
|
||||
if (("," + dto.getQueryInstructionIds().trim() + ",").indexOf(",3,") != -1) {
|
||||
Map<String, Object> ckResult = Maps.newHashMap();
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class LogisticsDirectiveApi {
|
|||
private ILogisticsDirectivePlanApi logisticsDirectivePlanApi;
|
||||
|
||||
/**
|
||||
* 获取仓库类服务指令树-配置数据
|
||||
* 获取库房类服务指令树-配置数据
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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<Map<String,Object>> getTreeDataWlnum(MaterialCategoryEntity configMaterialCategory) {
|
||||
Map<String,Object> 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<WarehouseMaterialCrkInfoEntity> 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<String, Object> pageList = invoicingApi.queryCrkInfoNumList(pageNo, pageSize, crkInfoEntity,req);
|
||||
return Result.OK(pageList);
|
||||
|
|
@ -551,7 +551,7 @@ public class InvoicingApi {
|
|||
|
||||
|
||||
/**
|
||||
* 仓库-查询物料列表
|
||||
* 库房-查询物料列表
|
||||
* @param materialInfoEntity
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import java.math.BigDecimal;
|
|||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: 仓库类服务指令
|
||||
* @Description: 库房类服务指令
|
||||
* @Author: caolei
|
||||
* @Date: 2025-11-28
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import java.io.Serializable;
|
|||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: 仓库类服务指令即时指令
|
||||
* @Description: 库房类服务指令即时指令
|
||||
* @Author: caolei
|
||||
* @Date: 2026-1-6
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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<BlWarehouseMaterialInfo> kfnumList = warehouseMaterialInfoService.list();
|
||||
Map<String, Map<String, Double>> kfWlSlMap = kfnumList.stream()
|
||||
|
|
@ -808,7 +808,7 @@ public class QingLingServiceImpl implements IQinglingApi {
|
|||
});
|
||||
warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList);
|
||||
|
||||
//修改仓库库存数量 当前的值 - 操作数量
|
||||
//修改库房库存数量 当前的值 - 操作数量
|
||||
Map<String, Double> qldWlNumMap = qldInfoList.stream()
|
||||
.collect(Collectors.toMap(NuInvoicingQldInfo::getWlId, NuInvoicingQldInfo::getQlNum));
|
||||
List<BlWarehouseMaterialInfo> kfUpdateList = Lists.newArrayList();
|
||||
|
|
|
|||
|
|
@ -225,13 +225,13 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
|
|||
|
||||
|
||||
/**
|
||||
* 添加全部物料至仓库
|
||||
* 添加全部物料至库房
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "添加全部物料至仓库")
|
||||
@ApiOperation(value = "添加全部物料至仓库", notes = "添加全部物料至仓库")
|
||||
@AutoLog(value = "添加全部物料至库房")
|
||||
@ApiOperation(value = "添加全部物料至库房", notes = "添加全部物料至库房")
|
||||
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
|
||||
@PostMapping(value = "/addAllWuliao")
|
||||
public Result<String> addAllWuliao(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
|
|||
@Override
|
||||
public String addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
//获取仓库nuid
|
||||
//获取库房nuid
|
||||
String nuId = blWarehouseMaterialInfo.getNuId();
|
||||
//获取所有剩余的物料信息，并且去掉库存上限或者下限为空的数据
|
||||
List<BlWarehouseMaterialInfo> list =baseMapper.getRemainingList(blWarehouseMaterialInfo);
|
||||
|
|
@ -130,7 +130,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
|
|||
//查询盘点单是否有占用的数据
|
||||
List<NuInvoicingPddMain> pddMainList = pddMainMapper.selectPddWlsfzyList(wlId);
|
||||
if(pddMainList.size()>0){
|
||||
map.put("message","有仓库正在盘点单中，等盘点结束后再进行操作");
|
||||
map.put("message","有库房正在盘点单中，等盘点结束后再进行操作");
|
||||
map.put("success",false);
|
||||
return map;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ public class DirectiveAppraisalServiceImpl extends ServiceImpl<DirectiveAppraisa
|
|||
// empSalary.setRealComPrice(meiRenTiCheng);
|
||||
// //工单单号 - 用于关联原始工单
|
||||
// empSalary.setOrderNo(directiveAppraisal.getOrderNo());
|
||||
// //工单类型 - 1护理、2医疗、3仓库、4行政
|
||||
// //工单类型 - 1护理、2医疗、3库房、4行政
|
||||
// empSalary.setOrderType(directiveAppraisal.getOrderType());
|
||||
// //护理单元ID - 关联nu_base_info表
|
||||
// empSalary.setNuId(directiveAppraisal.getNuId());
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class DirectiveDataPool implements Serializable {
|
|||
@TableId(type = IdType.ASSIGN_ID)
|
||||
/**id*/
|
||||
private String id;
|
||||
/**数据池类型 1护理;2医疗:3仓库;4行政*/
|
||||
/**数据池类型 1护理;2医疗:3库房;4行政*/
|
||||
private String poolType;
|
||||
/**业务id，服务指令计划id，即时指令计划id*/
|
||||
private String bizId;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import org.quartz.JobExecutionException;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
/**
|
||||
* 指令计划批量生成到指令池-仓库指令
|
||||
* 指令计划批量生成到指令池-库房指令
|
||||
*/
|
||||
@Slf4j
|
||||
public class InvoicingDataPoolJob implements Job {
|
||||
|
|
@ -20,7 +20,7 @@ public class InvoicingDataPoolJob implements Job {
|
|||
|
||||
@Override
|
||||
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
|
||||
log.error("DataPoolJob:{}-{}", DateUtils.now(),"仓库类指令计划批量生成到指令池开始");
|
||||
log.error("DataPoolJob:{}-{}", DateUtils.now(),"库房类指令计划批量生成到指令池开始");
|
||||
Result<?> result = service.generateDataPoolBatch();
|
||||
log.error("DataPoolJob:{}-{}", DateUtils.now(),result.getMessage());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<update id="createDataPoolLog">
|
||||
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 '业务单号，预留',
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 服务指令数据池管理-仓库类
|
||||
* @Description: 服务指令数据池管理-库房类
|
||||
* @Author: caolei
|
||||
* @Date: 2026-1-6
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -728,7 +728,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
|
|||
directiveOrder.setTableName("nu_biz_nu_medical_directive_plan");
|
||||
}
|
||||
if (orderType.equals("3")) {
|
||||
//仓库即时
|
||||
//库房即时
|
||||
directiveOrder.setTableName("nu_biz_nu_invoicing_directive_plan");
|
||||
}
|
||||
if (orderType.equals("4")) {
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ public class DirectivePlanController extends JeecgController<CareDirectivePlan,
|
|||
|
||||
}
|
||||
|
||||
//仓库类即时指令
|
||||
//库房类即时指令
|
||||
{
|
||||
//当天已完成总数
|
||||
int hllFinishedTotal = directiveOrderApi.queryTodayFinishedTotal("3", nuId, null);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 仓库类服务指令计划
|
||||
* @Description: 库房类服务指令计划
|
||||
* @Author: caolei
|
||||
* @Date: 2026-1-6
|
||||
* @Version: V1.0
|
||||
|
|
@ -26,7 +26,7 @@ import java.util.List;
|
|||
@TableName("nu_biz_nu_invoicing_directive_plan")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_biz_nu_invoicing_directive_plan对象", description="仓库类服务指令计划")
|
||||
@ApiModel(value="nu_biz_nu_invoicing_directive_plan对象", description="库房类服务指令计划")
|
||||
public class InvoicingDirectivePlan implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 户仓库类服务指令计划
|
||||
* @Description: 户库房类服务指令计划
|
||||
* @Author: caolei
|
||||
* @Date: 2025-11-28
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlan;
|
|||
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户仓库类服务指令计划
|
||||
* @Description: 护理单元客户库房类服务指令计划
|
||||
* @Author: caolei
|
||||
* @Date: 2025-11-28
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import java.util.Map;
|
|||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: 护理单元客户仓库类服务指令计划
|
||||
* @Description: 护理单元客户库房类服务指令计划
|
||||
* @Author: caolei
|
||||
* @Date: 2026-1-6
|
||||
* @Version: V1.0
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
# SQL文件命名规则
|
||||
`V[年月日]_[序号]__[模块名缩写]_[操作类型]_[业务描述].sql`
|
||||
|
||||
例如：
|
||||
```
|
||||
V20240104_1__easyoa_add_field_attendance.sql
|
||||
R__202402_drag_update_template.sql
|
||||
```
|
||||
|
||||
### SQL命名规则说明
|
||||
- 1.仅需要执行一次的，以大写“V”开头
|
||||
- 2.需要执行多次的，以大写“R”开头，命名如R__clean.sql，R的脚本只要改变了就会执行
|
||||
- 3.V开头的比R开头的优先级要高。
|
||||
|
||||
|
||||
### 命名规则示例
|
||||
参考博客：
|
||||
https://blog.csdn.net/Jiao1225/article/details/129590660
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
-- 补充缺少的请求权限配置
|
||||
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('f15543b0263cf6c5fac85afdd3eba3f2', '3f915b2769fc80648e92d04e84ca059d', '用户导入', '', NULL, 0, NULL, NULL, 2, 'system:user:import', '1', 1.00, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2019-05-13 19:15:27', 'admin', '2022-06-30 15:05:12', 0, 0, '1', 0);
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1801954937339428865', '1460888189937176577', '测试数据源连接', NULL, NULL, 0, NULL, NULL, 2, 'online:report:testConnection', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-06-15 20:28:30', NULL, NULL, 0, 0, '1', 0);
|
||||
INSERT IGNORE INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1535227149789184001', '1455101470794850305', '新建SQL增强', NULL, NULL, 0, NULL, NULL, 2, 'online:form:enhanceSql:save', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2022-06-10 19:47:30', 'admin', '2022-06-30 13:42:36', 0, 0, '1', 0);
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,20 +0,0 @@
|
|||
|
||||
ALTER TABLE `onl_drag_dataset_item`
|
||||
ADD COLUMN `dict_table` varchar(125) NULL AFTER `dict_code`,
|
||||
ADD COLUMN `dict_text` varchar(125) NULL AFTER `dict_table`;
|
||||
|
||||
|
||||
-- 仪表盘默认文件夹目录树---
|
||||
INSERT INTO `jimu_report_category`(`id`, `name`, `parent_id`, `iz_leaf`, `source_type`, `create_by`, `create_time`, `update_by`, `update_time`, `tenant_id`, `del_flag`) VALUES ('988299668956545024', '仪表盘设计', '0', 1, 'drag', '15931993294', '2024-08-27', '15931993294', '2024-08-28', NULL, 0);
|
||||
INSERT INTO `jimu_report_category`(`id`, `name`, `parent_id`, `iz_leaf`, `source_type`, `create_by`, `create_time`, `update_by`, `update_time`, `tenant_id`, `del_flag`) VALUES ('988299695309357056', '门户设计', '0', 1, 'drag', '15931993294', '2024-08-27', '15931993294', '2024-08-27', NULL, 0);
|
||||
|
||||
|
||||
ALTER TABLE `onl_drag_page`
|
||||
MODIFY COLUMN `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属分类' AFTER `protection_code`;
|
||||
UPDATE `onl_drag_page` SET `type` = '988299668956545024' WHERE `type` = '1';
|
||||
UPDATE `onl_drag_page` SET `type` = '988299695309357056' WHERE `type` = '2';
|
||||
|
||||
|
||||
INSERT INTO `onl_drag_comp` (`id`, `parent_id`, `comp_name`, `comp_type`, `icon`, `order_num`, `type_id`, `comp_config`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1537773244027863041', '1537773378102984706', '圆形雷达图', 'JCircleRadar', 'tabler:radar', 100, NULL, '{\r\n \"w\": 12,\r\n \"h\": 30,\n \"dataType\": 1,\n \"url\": \"http://api.jeecg.com/mock/33/radar\",\n \"timeOut\": 0,\n \"turnConfig\": {\n \"url\": \"\"\n },\n \"linkageConfig\": [],\n \"dataMapping\": [\n {\n \"filed\": \"分组\",\n \"mapping\": \"\"\n },\n {\n \"filed\": \"维度\",\n \"mapping\": \"\"\n },\n {\n \"filed\": \"数值\",\n \"mapping\": \"\"\n }\n ],\n \"chartData\": [\n {\n \"value\": 75,\n \"name\": \"得分\",\n \"type\": \"NBA\",\n \"max\": 100\n },\n {\n \"value\": 65,\n \"name\": \"篮板\",\n \"type\": \"NBA\",\n \"max\": 100\n },\n {\n \"value\": 55,\n \"name\": \"防守\",\n \"type\": \"NBA\",\n \"max\": 100\n },\n {\n \"value\": 74,\n \"name\": \"失误\",\n \"type\": \"NBA\",\n \"max\": 100\n },\n {\n \"value\": 38,\n \"name\": \"盖帽\",\n \"type\": \"NBA\",\n \"max\": 100\n },\n {\n \"value\": 88,\n \"name\": \"三分\",\n \"type\": \"NBA\",\n \"max\": 100\n }\n ],\n \"option\": {\n \"grid\": {\n \"show\": false,\n \"bottom\": 115\n },\n \"card\": {\n \"title\": \"\",\n \"extra\": \"\",\n \"rightHref\": \"\",\n \"size\": \"default\"\n },\n \"title\": {\n \"text\": \"圆形雷达图\",\r\n \"textStyle\":{\r\n \"fontWeight\":\"normal\"\r\n },\n \"show\": true\n },\n \"legend\": {\n \"data\": []\n },\n \"radar\": [\n {\n \"indicator\": []\n }\n ],\n \"series\": [\n {\n \"type\": \"radar\",\n \"data\": []\n }\n ]\n }\n}', '1', NULL, '2022-06-17 20:24:46', NULL, '2022-06-27 16:56:51');
|
||||
INSERT INTO `onl_drag_comp` (`id`, `parent_id`, `comp_name`, `comp_type`, `icon`, `order_num`, `type_id`, `comp_config`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1537318433201340417', '1537764868216684545', '金字塔漏斗图', 'JPyramidFunnel', 'icon-park-outline:children-pyramid', 100, NULL, '{\r\n \"w\": 12,\r\n \"h\": 30,\n \"dataType\": 1,\n \"url\": \"http://api.jeecg.com/mock/26/funnel\",\n \"timeOut\": 0,\n \"turnConfig\": {\n \"url\": \"\"\n },\n \"linkageConfig\": [],\n \"dataMapping\": [\n {\n \"filed\": \"维度\",\n \"mapping\": \"\"\n },\n {\n \"filed\": \"数值\",\n \"mapping\": \"\"\n }\n ],\n \"chartData\": [\n {\n \"value\": 1000,\n \"name\": \"直接访问\"\n },\n {\n \"value\": 200,\n \"name\": \"邮件营销\"\n },\n {\n \"value\": 400,\n \"name\": \"联盟广告\"\n },\n {\n \"value\": 600,\n \"name\": \"网页查询\"\n },\n {\n \"value\": 800,\n \"name\": \"广告点击\"\n }\n ],\n \"option\": {\n \"title\": {\n \"text\": \"基础漏斗图\",\r\n \"textStyle\":{\r\n \"fontWeight\":\"normal\"\r\n },\n \"show\": true\n },\n \"grid\": {\n \"bottom\": 115\n },\n \"card\": {\n \"title\": \"\",\n \"extra\": \"\",\n \"rightHref\": \"\",\n \"size\": \"default\"\n },\n \"tooltip\": {\n \"trigger\": \"item\",\n \"formatter\": \"{a} <br/>{b} : {c}%\"\n },\n \"legend\": {\n \"orient\": \"horizontal\"\n },\n \"series\": [\n {\n \"name\": \"Funnel\",\n \"type\": \"funnel\",\n \"left\": \"10%\",\n \"width\": \"80%\",\n \"sort\": \"ascending\",\n \"gap\": 2,\n \"label\": {\n \"show\": true,\n \"position\": \"inside\"\n },\n \"labelLine\": {\n \"length\": 10,\n \"lineStyle\": {\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"itemStyle\": {\n \"borderColor\": \"#fff\",\n \"borderWidth\": 1\n },\n \"emphasis\": {\n \"label\": {\n \"fontSize\": 20\n }\n }\n }\n ]\n }\n}', '1', NULL, '2022-06-16 14:17:31', NULL, '2022-06-16 14:59:44');
|
||||
INSERT INTO `onl_drag_comp` (`id`, `parent_id`, `comp_name`, `comp_type`, `icon`, `order_num`, `type_id`, `comp_config`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('100100', '100', '查询条件', 'JForm', 'ant-design:form-outlined', 1, NULL, '{\n \"w\": 24,\n \"h\": 12,\n \"dataType\": 1,\n \"timeOut\": -1,\n \"option\": {}\n}', '1', NULL, NULL, 'jeecg', '2022-04-29 18:55:15');
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,9 +0,0 @@
|
|||
-- ---author:wangshuai---date:20241108-----for: 修改字段变更为为钉钉企业id---
|
||||
ALTER TABLE sys_third_app_config
|
||||
CHANGE COLUMN agent_app_secret corp_id varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉企业id' AFTER client_secret;
|
||||
|
||||
UPDATE `sys_gateway_route` SET `predicates` = '[{\"args\":[\"/websocket/**\",\"/eoaSocket/**\",\"/newsWebsocket/**\",\"/dragChannelSocket/**\"],\"name\":\"Path\"}]' WHERE `id` = 'jeecg-cloud-websocket';
|
||||
|
||||
-- ---author:sunjianlei---date:20240930-----for: 【TV360X-2604】【Online表单】按钮权限未激活时增加提示，添加查询索引 ---
|
||||
ALTER TABLE onl_auth_page ADD INDEX idx_onl_auth_page_code(code);
|
||||
ALTER TABLE onl_auth_page ADD INDEX idx_onl_auth_page_cgform_id(cgform_id);
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,3 +0,0 @@
|
|||
-- 升级积木BI到最新版
|
||||
UPDATE onl_drag_comp SET status='0' WHERE parent_id = '0';
|
||||
update onl_drag_page set type =0 where iz_template = '1';
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
-- -author:chenrui---date:2025/1/16-----for:[QQYUN-10935]【jeecg】租户套餐管理优化---
|
||||
UPDATE `sys_permission` SET `parent_id` = 'd7d6e2e4e2934f2c9385a623fd98c6f3', `name` = '租户初始套餐' WHERE `id` = '1668174661456171010';
|
||||
|
||||
-- -- author:chenrui---date:20250206--for: [QQYUN-11032]【jeecg】租户套餐管理增加初始化套餐包按钮 ---
|
||||
INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1887447660072292354', '1280350452934307841', '初始化套餐包', NULL, NULL, 0, NULL, NULL, 2, 'system:tenant:syncDefaultPack', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'jeecg', '2025-02-06 18:26:04', 'jeecg', '2025-02-06 18:26:53', 0, 0, '1', 0);
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
ALTER TABLE `jimu_report_db_field`
|
||||
ADD COLUMN `field_name_physics` varchar(200) NULL COMMENT '物理字段名（文件数据集使用，存的是excel的字段标题）' AFTER `field_name`;
|
||||
|
||||
CREATE TABLE `jimu_report_icon_lib` (
|
||||
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
|
||||
`name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片名称',
|
||||
`type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片类型',
|
||||
`image_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图片地址',
|
||||
`create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`tenant_id` int(11) DEFAULT NULL COMMENT '租户id',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='积木图库表';
|
||||
|
||||
INSERT INTO `jimu_dict`(`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`, `tenant_id`) VALUES ('1047797573274468352', '系统图库', 'gallery', '', 0, 'admin', '2025-02-07 19:00:19', NULL, NULL, 0, '1');
|
||||
INSERT INTO `jimu_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1047797624512086016', '1047797573274468352', '常规', 'common', NULL, 1, 1, 'admin', '2025-02-07 19:00:31', NULL, NULL);
|
||||
INSERT INTO `jimu_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1047797669877678080', '1047797573274468352', '指向', 'point', NULL, 1, 1, 'admin', '2025-02-07 19:00:42', '15931993294', '2025-02-07 19:01:11');
|
||||
INSERT INTO `jimu_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1047797751893098496', '1047797573274468352', '专业', 'major', NULL, 1, 1, 'admin', '2025-02-07 19:01:01', NULL, NULL);
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1876220177009315842', '1473927410093187073', '表单设计页面查询', NULL, NULL, 0, NULL, NULL, 2, 'drag:design:getTotalData', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-01-06 18:52:03', NULL, NULL, 0, 0, '1', 0);
|
||||
INSERT INTO `sys_role_permission` (`id`, `role_id`, `permission_id`, `data_rule_ids`, `operate_date`, `operate_ip`) VALUES ('1892117657990971393', '1456165677820301314', '1876220177009315842', NULL, '2025-02-19 15:42:58', '0:0:0:0:0:0:0:1');
|
||||
Loading…
Reference in New Issue