root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init project

Browse Source
This commit is contained in:
zhangzhiqiang
2023-05-06 17:18:46 +08:00
parent 46990a545c
commit a7f9ea77ac
142 changed files with 1415 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/common/utils/LocalCache.java
View File

@@ -1,10 +1,9 @@
package org.nl.common.utils;
import com.alibaba.fastjson.JSONArray;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pda.dto.MaterialDto;
import org.nl.wms.pda_manage.pda.dto.MaterialDto;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;

2
mes/hd/nladmin-system/src/main/java/org/nl/start/Init.java
View File

@@ -31,7 +31,7 @@ public class Init implements ApplicationRunner {
private void init() throws Exception {
//初始化WQL
initWql();
// initWql();
//随线程启动
// initApplicationAutoInitialExecuter();
// initWebAutoInitialExecuter();

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_analysis/bigScreen.xls → mes/hd/nladmin-system/src/main/java/org/nl/wms/big_screen/bigScreen.xls
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_analysis/ds_agv.xls → mes/hd/nladmin-system/src/main/java/org/nl/wms/big_screen/ds_agv.xls
View File

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -17,7 +17,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.AcsToWmsService;
import org.nl.wms.pda.service.CacheLineHandService;
import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
import org.nl.wms.product_manage.sch.service.TaskService;
import org.nl.wms.product_manage.sch.service.dto.TaskDto;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/MaterialbaseServiceImpl.java
View File

@@ -22,7 +22,7 @@ import org.nl.wms.masterdata_manage.master.constant.MaterOptTypeEnum;
import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
import org.nl.wms.masterdata_manage.master.service.MaterialbaseService;
import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
import org.nl.wms.pda.dto.MaterialDto;
import org.nl.wms.pda_manage.pda.dto.MaterialDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/CachelineVehileMaterialDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/CachelineVehileMaterialDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.pda.dto;
package org.nl.wms.pda_manage.pda.dto;
import lombok.Data;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/MaterialDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/MaterialDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.pda.dto;
package org.nl.wms.pda_manage.pda.dto;
import lombok.Data;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.pda.rest;
package org.nl.wms.pda_manage.pda.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONArray;
@@ -11,8 +11,8 @@ import org.apache.commons.lang3.StringUtils;
import org.nl.common.anno.Log;
import org.nl.common.utils.api.ResultCode;
import org.nl.modules.common.exception.BizCoreException;
import org.nl.wms.pda.dto.MaterialDto;
import org.nl.wms.pda.service.CacheLineHandService;
import org.nl.wms.pda_manage.pda.dto.MaterialDto;
import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaProductIosController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.pda.rest;
package org.nl.wms.pda_manage.pda.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.lang.Assert;
@@ -13,7 +13,7 @@ import org.nl.common.anno.Log;
import org.nl.common.utils.MapOf;
import org.nl.wms.masterdata_manage.st.service.SectattrService;
import org.nl.wms.masterdata_manage.st.service.StructivtService;
import org.nl.wms.pcs.service.SaleOrderService;
import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService;
import org.nl.wms.product_manage.sch.service.PointService;
import org.nl.wms.storage_manage.service.product.ProductInService;
import org.springframework.beans.factory.annotation.Autowired;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/CacheLineHandService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java
View File

@@ -1,9 +1,9 @@
package org.nl.wms.pda.service;
package org.nl.wms.pda_manage.pda.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.utils.api.CommonResult;
import org.nl.wms.pda.dto.MaterialDto;
import org.nl.wms.pda_manage.pda.dto.MaterialDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.pda.service.impl;
package org.nl.wms.pda_manage.pda.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
@@ -23,8 +23,8 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.pda.dto.MaterialDto;
import org.nl.wms.pda.service.CacheLineHandService;
import org.nl.wms.pda_manage.pda.dto.MaterialDto;
import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/wql/PDA_QUERY.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/1.txt → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/1.txt
View File

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/DeliveryOrderController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pcs.rest;
package org.nl.wms.procure_manage.备份pcs.rest;
import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pcs.service.DeliveryOrderService;
import org.nl.wms.pcs.service.dto.DeliveryOrderDto;
import org.nl.wms.procure_manage.备份pcs.service.DeliveryOrderService;
import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/SaleOrderController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pcs.rest;
package org.nl.wms.procure_manage.备份pcs.rest;
import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pcs.service.SaleOrderService;
import org.nl.wms.pcs.service.dto.SaleOrderDto;
import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService;
import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/DeliveryOrderService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.pcs.service;
package org.nl.wms.procure_manage.备份pcs.service;
import org.nl.wms.pcs.service.dto.DeliveryOrderDto;
import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/SaleOrderService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.pcs.service;
package org.nl.wms.procure_manage.备份pcs.service;
import org.nl.wms.pcs.service.dto.SaleOrderDto;
import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/DeliveryOrderDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java
View File

@@ -1,14 +1,12 @@
package org.nl.wms.pcs.service.dto;
package org.nl.wms.procure_manage.备份pcs.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description /

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/SaleOrderDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java
View File

@@ -1,14 +1,12 @@
package org.nl.wms.pcs.service.dto;
package org.nl.wms.procure_manage.备份pcs.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description /

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/DeliveryOrderServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pcs.service.impl;
package org.nl.wms.procure_manage.备份pcs.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -19,8 +19,8 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
import org.nl.wms.pcs.service.DeliveryOrderService;
import org.nl.wms.pcs.service.dto.DeliveryOrderDto;
import org.nl.wms.procure_manage.备份pcs.service.DeliveryOrderService;
import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/SaleOrderServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pcs.service.impl;
package org.nl.wms.procure_manage.备份pcs.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -19,8 +19,8 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
import org.nl.wms.pcs.service.SaleOrderService;
import org.nl.wms.pcs.service.dto.SaleOrderDto;
import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService;
import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_DELIVERYORDER001.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_DELIVERYORDER001.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_SALEORDER001.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_SALEORDER001.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/pcs.xls → mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/pcs.xls
View File

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls
View File

Binary file not shown.

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java
View File

@@ -17,8 +17,8 @@ import org.nl.common.utils.MapOf;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.pdm.IPdmProduceWashorderService;
import org.nl.wms.pdm.dao.PdmProduceWashorder;
import org.nl.wms.product_manage.备份pdm.IPdmProduceWashorderService;
import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.FileSystemResourceLoader;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/IPdmProduceWashorderService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/IPdmProduceWashorderService.java
View File

@@ -1,8 +1,8 @@
package org.nl.wms.pdm;
package org.nl.wms.product_manage.备份pdm;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.pdm.dao.PdmProduceWashorder;
import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
/**
* <p>

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/PdmProduceWashorder.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/PdmProduceWashorder.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.pdm.dao;
package org.nl.wms.product_manage.备份pdm.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.java
View File

@@ -1,8 +1,8 @@
package org.nl.wms.pdm.dao.mapper;
package org.nl.wms.product_manage.备份pdm.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.pdm.dao.PdmProduceWashorder;
import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
/**
* <p>

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.xml → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.pdm.dao.mapper.PdmProduceWashorderMapper">
<mapper namespace="org.nl.wms.product_manage.备份pdm.dao.mapper.PdmProduceWashorderMapper">
</mapper>

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/impl/PdmProduceWashorderServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/impl/PdmProduceWashorderServiceImpl.java
View File

@@ -1,10 +1,10 @@
package org.nl.wms.pdm.impl;
package org.nl.wms.product_manage.备份pdm.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.pdm.IPdmProduceWashorderService;
import org.nl.wms.pdm.dao.PdmProduceWashorder;
import org.nl.wms.pdm.dao.mapper.PdmProduceWashorderMapper;
import org.nl.wms.product_manage.备份pdm.IPdmProduceWashorderService;
import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
import org.nl.wms.product_manage.备份pdm.dao.mapper.PdmProduceWashorderMapper;
import org.springframework.stereotype.Service;
/**

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/BomController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/BomController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.rest;
package org.nl.wms.product_manage.备份pdm.rest;
import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pdm.service.BomService;
import org.nl.wms.product_manage.备份pdm.service.BomService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.rest;
package org.nl.wms.product_manage.备份pdm.rest;
import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.anno.Log;
import org.nl.wms.pdm.service.DeviceService;
import org.nl.wms.pdm.service.dto.DeviceDto;
import org.nl.wms.product_manage.备份pdm.service.DeviceService;
import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceitemController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.rest;
package org.nl.wms.product_manage.备份pdm.rest;
import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pdm.service.DeviceitemService;
import org.nl.wms.pdm.service.dto.DeviceitemDto;
import org.nl.wms.product_manage.备份pdm.service.DeviceitemService;
import org.nl.wms.product_manage.备份pdm.service.dto.DeviceitemDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/FactoryCalendarController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.rest;
package org.nl.wms.product_manage.备份pdm.rest;
import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pdm.service.FactoryCalendarService;
import org.nl.wms.product_manage.备份pdm.service.FactoryCalendarService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProcessrouteController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProcessrouteController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.rest;
package org.nl.wms.product_manage.备份pdm.rest;
import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pdm.service.ProcessrouteService;
import org.nl.wms.product_manage.备份pdm.service.ProcessrouteService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProductprocessrouteController.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProductprocessrouteController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.rest;
package org.nl.wms.product_manage.备份pdm.rest;
import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pdm.service.ProductprocessrouteService;
import org.nl.wms.product_manage.备份pdm.service.ProductprocessrouteService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/BomService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/BomService.java
View File

@@ -1,9 +1,9 @@
package org.nl.wms.pdm.service;
package org.nl.wms.product_manage.备份pdm.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.pdm.service.dto.BomDto;
import org.nl.wms.product_manage.备份pdm.service.dto.BomDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceService.java
View File

@@ -1,13 +1,11 @@
package org.nl.wms.pdm.service;
package org.nl.wms.product_manage.备份pdm.service;
import com.alibaba.fastjson.JSONArray;
import org.nl.wms.pdm.service.dto.DeviceDto;
import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
/**
* @description 服务接口

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceitemService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceitemService.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.pdm.service;
package org.nl.wms.product_manage.备份pdm.service;
import org.nl.wms.pdm.service.dto.DeviceitemDto;
import org.nl.wms.product_manage.备份pdm.service.dto.DeviceitemDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/FactoryCalendarService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/FactoryCalendarService.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.service;
package org.nl.wms.product_manage.备份pdm.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProcessrouteService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java
View File

@@ -1,10 +1,10 @@
package org.nl.wms.pdm.service;
package org.nl.wms.product_manage.备份pdm.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.pdm.service.dto.ProcessrouteDto;
import org.nl.wms.product_manage.备份pdm.service.dto.ProcessrouteDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProductprocessrouteService.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java
View File

@@ -1,9 +1,9 @@
package org.nl.wms.pdm.service;
package org.nl.wms.product_manage.备份pdm.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.pdm.service.dto.ProductprocessrouteDto;
import org.nl.wms.product_manage.备份pdm.service.dto.ProductprocessrouteDto;
import org.springframework.data.domain.Pageable;
import java.util.List;

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/BomDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/BomDto.java
View File

@@ -1,7 +1,6 @@
package org.nl.wms.pdm.service.dto;
package org.nl.wms.product_manage.备份pdm.service.dto;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.pdm.service.dto;
package org.nl.wms.product_manage.备份pdm.service.dto;
import lombok.Data;

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceitemDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceitemDto.java
View File

@@ -1,9 +1,8 @@
package org.nl.wms.pdm.service.dto;
package org.nl.wms.product_manage.备份pdm.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProcessrouteDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProcessrouteDto.java
View File

@@ -1,14 +1,12 @@
package org.nl.wms.pdm.service.dto;
package org.nl.wms.product_manage.备份pdm.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description /

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProductprocessrouteDto.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProductprocessrouteDto.java
View File

@@ -1,14 +1,12 @@
package org.nl.wms.pdm.service.dto;
package org.nl.wms.product_manage.备份pdm.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description /

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/BomServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.service.impl;
package org.nl.wms.product_manage.备份pdm.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -10,15 +10,14 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.service.BomService;
import org.nl.wms.pdm.service.dto.BomDto;
import org.nl.wms.product_manage.备份pdm.service.BomService;
import org.nl.wms.product_manage.备份pdm.service.dto.BomDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.service.impl;
package org.nl.wms.product_manage.备份pdm.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -12,11 +12,10 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.service.DeviceService;
import org.nl.wms.pdm.service.dto.DeviceDto;
import org.nl.wms.product_manage.备份pdm.service.DeviceService;
import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceitemServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceitemServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.service.impl;
package org.nl.wms.product_manage.备份pdm.service.impl;
import cn.hutool.core.map.MapUtil;
@@ -10,14 +10,13 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import org.nl.common.anno.Log;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.service.DeviceitemService;
import org.nl.wms.pdm.service.dto.DeviceitemDto;
import org.nl.wms.product_manage.备份pdm.service.DeviceitemService;
import org.nl.wms.product_manage.备份pdm.service.dto.DeviceitemDto;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.service.impl;
package org.nl.wms.product_manage.备份pdm.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -17,7 +17,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.service.FactoryCalendarService;
import org.nl.wms.product_manage.备份pdm.service.FactoryCalendarService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProcessrouteServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.service.impl;
package org.nl.wms.product_manage.备份pdm.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -17,8 +17,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.service.ProcessrouteService;
import org.nl.wms.pdm.service.dto.ProcessrouteDto;
import org.nl.wms.product_manage.备份pdm.service.ProcessrouteService;
import org.nl.wms.product_manage.备份pdm.service.dto.ProcessrouteDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.pdm.service.impl;
package org.nl.wms.product_manage.备份pdm.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -18,8 +18,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.service.ProductprocessrouteService;
import org.nl.wms.pdm.service.dto.ProductprocessrouteDto;
import org.nl.wms.product_manage.备份pdm.service.ProductprocessrouteService;
import org.nl.wms.product_manage.备份pdm.service.dto.ProductprocessrouteDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_BOM01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/PDM_BI_BOM01.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/PDM_BI_DEVICE01.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_BI_PRODUCTROUTE01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_FACTORYCALENDAR.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_FACTORYCALENDAR.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QP_BI_PROCESSROUTE01.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QP_BI_PROCESSROUTE01.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QUERY_DEVICE.wql
View File

0
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls → mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls
View File

66
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQinspectionPointController.java
View File

@@ -1,66 +0,0 @@
package org.nl.wms.ql.controller.inspection;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.ql.service.inspection.IMdQlInspectionpointService;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
import org.nl.wms.ql.service.inspection.dto.InspectionQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
/**
* <p>
* 物料检测项点 前端控制器
* </p>
*
* @author generator
* @since 2023-04-23
*/
@RestController
@RequestMapping("/api/mdQlInspectionpoint")
public class MdQinspectionPointController {
@Autowired
private IMdQlInspectionpointService inspectionpointService;
@GetMapping()
public ResponseEntity<Object> query(InspectionQuery query, PageQuery pageQuery){
return new ResponseEntity<>(TableDataInfo.build(inspectionpointService.page(query,pageQuery)),HttpStatus.OK);
}
@PostMapping("/create")
public ResponseEntity<Object> create(@RequestBody JSONObject req){
Assert.notNull(req,"参数不能为空");
inspectionpointService.create(req);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/update")
public ResponseEntity<Object> update(@RequestBody JSONObject req){
Assert.notNull(req,"参数不能为空");
MdQlInspectionpoint form = req.toJavaObject(MdQlInspectionpoint.class);
form.setUpdateId(SecurityUtils.getCurrentUserId());
form.setUpdateName(SecurityUtils.getCurrentNickName());
form.setUpdateTime(new Date());
inspectionpointService.updateById(form);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/delete")
public ResponseEntity<Object> delete(@RequestBody List<String> ids){
Assert.notNull(ids,"参数不能为空");
inspectionpointService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

87
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQlMaterialinspectionController.java
View File

@@ -1,87 +0,0 @@
package org.nl.wms.ql.controller.inspection;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ql.service.inspection.IMdQlInspectionpointService;
import org.nl.wms.ql.service.inspection.IMdQlMaterialinspectionService;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* <p>
* 物料检测项点 前端控制器
* </p>
*
* @author generator
* @since 2023-04-23
*/
@RestController
@RequestMapping("/api/materialInspection")
public class MdQlMaterialinspectionController {
@Autowired
private IMdQlInspectionpointService inspectionpointService;
@Autowired
private IMdQlMaterialinspectionService materialinspectionService;
@GetMapping("/mst")
@SaIgnore
public ResponseEntity<Object> query(MaterialInspectionQuery query, PageQuery pageQuery){
return new ResponseEntity<>(TableDataInfo.build(materialinspectionService.pageQuery(query,pageQuery)),HttpStatus.OK);
}
@PostMapping("/create")
public ResponseEntity<Object> create(@RequestBody JSONObject req){
Assert.notNull(req,"参数不能为空");
materialinspectionService.create(req);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/update")
public ResponseEntity<Object> update(@RequestBody JSONObject req){
Assert.notNull(req,"参数不能为空");
MdQlMaterialinspection form = req.toJavaObject(MdQlMaterialinspection.class);
form.setUpdateId(SecurityUtils.getCurrentUserId());
form.setUpdateName(SecurityUtils.getCurrentNickName());
form.setUpdateTime(new Date());
materialinspectionService.updateById(form);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/delete")
public ResponseEntity<Object> delete(@RequestBody List<String> ids){
Assert.notNull(ids,"参数不能为空");
inspectionpointService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/report/MdMeInspectionsheetController.java
View File

@@ -1,21 +0,0 @@
package org.nl.wms.ql.controller.report;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 质检报告 前端控制器
* </p>
*
* @author generator
* @since 2023-04-23
*/
@RestController
@RequestMapping("/mdMeInspectionsheet")
public class MdMeInspectionsheetController {
}

24
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlInspectionpointService.java
View File

@@ -1,24 +0,0 @@
package org.nl.wms.ql.service.inspection;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
import org.nl.wms.ql.service.inspection.dto.InspectionQuery;
/**
* <p>
* 检测项点 服务类
* </p>
*
* @author generator
* @since 2023-04-23
*/
public interface IMdQlInspectionpointService extends IService<MdQlInspectionpoint> {
void create(JSONObject form);
Page page(InspectionQuery query, PageQuery pageQuery);
}

22
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlMaterialinspectionService.java
View File

@@ -1,22 +0,0 @@
package org.nl.wms.ql.service.inspection;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
/**
* <p>
* 物料检测项点 服务类
* </p>
*
* @author generator
* @since 2023-04-23
*/
public interface IMdQlMaterialinspectionService extends IService<MdQlMaterialinspection> {
void create(JSONObject form);
Page pageQuery(MaterialInspectionQuery query, PageQuery pageQuery);
}

87
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlInspectionpoint.java
View File

@@ -1,87 +0,0 @@
package org.nl.wms.ql.service.inspection.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 检测项点
* </p>
*
* @author generator
* @since 2023-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("md_ql_inspectionpoint")
public class MdQlInspectionpoint implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 项目id
*/
@TableId(value = "inspection_id", type = IdType.NONE)
private String inspectionId;
/**
* 项目编码
*/
private String inspectionCode;
/**
* 项目名称
*/
private String name;
/**
* 检测类型
*/
private String inspectionType;
/**
* 标准值
*/
private String standard;
/**
* 创建人姓名
*/
private String createName;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private String createId;
/**
* 修改人
*/
private String updateId;
/**
* 修改人姓名
*/
private String updateName;
/**
* 备注
*/
private String remark;
/**
* 修改时间
*/
private Date updateTime;
}

81
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlMaterialinspection.java
View File

@@ -1,81 +0,0 @@
package org.nl.wms.ql.service.inspection.dao;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 物料检测项点
* </p>
*
* @author generator
* @since 2023-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("md_ql_materialinspection")
public class MdQlMaterialinspection implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 物料id
*/
@TableId(value = "material_code")
private String material_code;
/**
* 检测项名称
*/
private String name;
/**
* 项目集合{"项目编号"："true"/123.000~123.500}
*/
private String inspections;
/**
* 版本号
*/
private String version;
/**
* 创建人
*/
private String createId;
/**
* 创建人姓名
*/
private String createName;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改人
*/
private String updateId;
/**
* 修改人姓名
*/
private String updateName;
/**
* 修改时间
*/
private Date updateTime;
/**
* 是否启用
*/
private Boolean isUsed;
}

44
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/TypeHandler/InspectionArrayHandler.java
View File

@@ -1,44 +0,0 @@
package org.nl.wms.ql.service.inspection.dao.TypeHandler;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import jdk.nashorn.internal.parser.JSONParser;
import org.apache.ibatis.type.*;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
/*
* @author ZZQ
* @Date 2023/4/24 09:50
*/
@MappedJdbcTypes(JdbcType.VARCHAR)
@MappedTypes(JSONArray.class)
public class InspectionArrayHandler extends BaseTypeHandler<List<MdQlInspectionpoint>> {
@Override
public void setNonNullParameter(PreparedStatement ps, int i, List<MdQlInspectionpoint> parameter, JdbcType jdbcType) throws SQLException {
ps.setString(i, JSON.toJSONString(parameter));
}
@Override
public List<MdQlInspectionpoint> getNullableResult(ResultSet rs, String columnName) throws SQLException {
return JSONArray.parseArray(rs.getString(columnName),MdQlInspectionpoint.class);
}
@Override
public List<MdQlInspectionpoint> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
return JSONArray.parseArray(rs.getString(columnIndex),MdQlInspectionpoint.class);
}
@Override
public List<MdQlInspectionpoint> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
return JSONArray.parseArray(cs.getString(columnIndex),MdQlInspectionpoint.class);
}
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlInspectionpointMapper.java
View File

@@ -1,16 +0,0 @@
package org.nl.wms.ql.service.inspection.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
/**
* <p>
* 检测项点 Mapper 接口
* </p>
*
* @author generator
* @since 2023-04-23
*/
public interface MdQlInspectionpointMapper extends BaseMapper<MdQlInspectionpoint> {
}

22
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.java
View File

@@ -1,22 +0,0 @@
package org.nl.wms.ql.service.inspection.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
import org.nl.wms.ql.service.inspection.dto.MdQlMaterialinspectionDto;
import java.util.List;
/**
* <p>
* 物料检测项点 Mapper 接口
* </p>
*
* @author generator
* @since 2023-04-23
*/
public interface MdQlMaterialinspectionMapper extends BaseMapper<MdQlMaterialinspection> {
List<MdQlMaterialinspectionDto> pageQuery(@Param("query") MaterialInspectionQuery query);
}

27
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.ql.service.inspection.dao.mapper.MdQlMaterialinspectionMapper">
<resultMap id="BaseResultMap" type="org.nl.wms.ql.service.inspection.dto.MdQlMaterialinspectionDto" autoMapping="true">
<id column="id" jdbcType="BIGINT" property="materialCode" />
<result column="inspections" typeHandler="org.nl.wms.ql.service.inspection.dao.TypeHandler.InspectionArrayHandler" property="inspections"></result>
</resultMap>
<select id="pageQuery" resultMap="BaseResultMap">
select
`name`
,material_code
,inspections,version
,create_id
,create_name
,create_time
,update_id
,update_name
,update_time
,is_used
from md_ql_materialinspection
<where>
<if test="query.blurry != null and query.blurry != ''">
material_code '%${query.blurry}%'
</if>
</where>
</select>
</mapper>

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/InspectionQuery.java
View File

@@ -1,14 +0,0 @@
package org.nl.wms.ql.service.inspection.dto;
import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
/*
* @author ZZQ
* @Date 2022/12/15 4:20 下午
*/
@Data
public class InspectionQuery extends BaseQuery<MdQlInspectionpoint> {
}

15
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MaterialInspectionQuery.java
View File

@@ -1,15 +0,0 @@
package org.nl.wms.ql.service.inspection.dto;
import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
/*
* @author ZZQ
* @Date 2022/12/15 4:20 下午
*/
@Data
public class MaterialInspectionQuery extends BaseQuery<MdQlMaterialinspection> {
}

83
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MdQlMaterialinspectionDto.java
View File

@@ -1,83 +0,0 @@
package org.nl.wms.ql.service.inspection.dto;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* <p>
* 物料检测项点
* </p>
*
* @author generator
* @since 2023-04-23
*/
@Data
public class MdQlMaterialinspectionDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 物料id
*/
private String materialCode;
/**
* 检测项名称
*/
private String name;
/**
* 项目集合{"项目编号"："true"/123.000~123.500}
*/
private List<MdQlInspectionpoint> inspections;
/**
* 版本号
*/
private String version;
/**
* 创建人
*/
private String createId;
/**
* 创建人姓名
*/
private String createName;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改人
*/
private String updateId;
/**
* 修改人姓名
*/
private String updateName;
/**
* 修改时间
*/
private Date updateTime;
/**
* 是否启用
*/
private Boolean isUsed;
}

47
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlInspectionpointServiceImpl.java
View File

@@ -1,47 +0,0 @@
package org.nl.wms.ql.service.inspection.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.jsonwebtoken.lang.Assert;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.ql.service.inspection.IMdQlInspectionpointService;
import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
import org.nl.wms.ql.service.inspection.dao.mapper.MdQlInspectionpointMapper;
import org.nl.wms.ql.service.inspection.dto.InspectionQuery;
import org.springframework.stereotype.Service;
import java.util.Date;
/**
* <p>
* 检测项点 服务实现类
* </p>
*
* @author generator
* @since 2023-04-23
*/
@Service
public class MdQlInspectionpointServiceImpl extends ServiceImpl<MdQlInspectionpointMapper, MdQlInspectionpoint> implements IMdQlInspectionpointService {
@Override
public void create(JSONObject form) {
Assert.notNull(form,"请求参数不能为空");
MdQlInspectionpoint param = form.toJavaObject(MdQlInspectionpoint.class);
param.setInspectionId(IdUtil.getStringId());
param.setInspectionCode(CodeUtil.getNewCode("INSPECTION_POINT"));
param.setCreateName(SecurityUtils.getCurrentNickName());
param.setCreateId(SecurityUtils.getCurrentUserId());
param.setCreateTime(new Date());
this.save(param);
}
@Override
public Page page(InspectionQuery query, PageQuery pageQuery) {
return this.page(pageQuery.build(MdQlInspectionpoint.class), query.build());
}
}

48
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlMaterialinspectionServiceImpl.java
View File

@@ -1,48 +0,0 @@
package org.nl.wms.ql.service.inspection.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.jsonwebtoken.lang.Assert;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.ql.service.inspection.IMdQlMaterialinspectionService;
import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
import org.nl.wms.ql.service.inspection.dao.mapper.MdQlMaterialinspectionMapper;
import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
/**
* <p>
* 物料检测项点 服务实现类
* </p>
*
* @author generator
* @since 2023-04-23
*/
@Service
public class MdQlMaterialinspectionServiceImpl extends ServiceImpl<MdQlMaterialinspectionMapper, MdQlMaterialinspection> implements IMdQlMaterialinspectionService {
@Resource
MdQlMaterialinspectionMapper mdQlMaterialinspectionMapper;
@Override
public void create(JSONObject form) {
Assert.notNull(form,"请求参数不能为空");
MdQlMaterialinspection param = form.toJavaObject(MdQlMaterialinspection.class);
param.setInspections(IdUtil.getStringId());
param.setCreateName(SecurityUtils.getCurrentNickName());
param.setCreateId(SecurityUtils.getCurrentUserId());
param.setCreateTime(new Date());
this.save(param);
}
@Override
public Page pageQuery(MaterialInspectionQuery query, PageQuery pageQuery) {
return this.page(pageQuery.build(MdQlMaterialinspection.class), query.build());
}
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/IMdMeInspectionsheetService.java
View File

@@ -1,16 +0,0 @@
package org.nl.wms.ql.service.report;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.ql.service.report.dao.MdMeInspectionsheet;
/**
* <p>
* 质检报告 服务类
* </p>
*
* @author generator
* @since 2023-04-23
*/
public interface IMdMeInspectionsheetService extends IService<MdMeInspectionsheet> {
}

90
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/MdMeInspectionsheet.java
View File

@@ -1,90 +0,0 @@
package org.nl.wms.ql.service.report.dao;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 质检报告
* </p>
*
* @author generator
* @since 2023-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("md_me_inspectionsheet")
public class MdMeInspectionsheet implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 质检id
*/
private String inspectionsheetId;
/**
* 质检编号
*/
private String inspectionsheetCode;
/**
* 物料id
*/
private String materialId;
/**
* 批次
*/
private String pcsn;
/**
* 质检单类型
*/
private String type;
/**
* 检测项目集合
*/
private String inspections;
/**
* 创建人
*/
private String createId;
/**
* 创建人姓名
*/
private String createName;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改人
*/
private String updateId;
/**
* 修改人姓名
*/
private String updateName;
/**
* 修改时间
*/
private Date updateTime;
/**
* 是否删除
*/
private Boolean isDeleted;
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/mapper/MdMeInspectionsheetMapper.java
View File

@@ -1,16 +0,0 @@
package org.nl.wms.ql.service.report.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.ql.service.report.dao.MdMeInspectionsheet;
/**
* <p>
* 质检报告 Mapper 接口
* </p>
*
* @author generator
* @since 2023-04-23
*/
public interface MdMeInspectionsheetMapper extends BaseMapper<MdMeInspectionsheet> {
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/impl/MdMeInspectionsheetServiceImpl.java
View File

@@ -1,21 +0,0 @@
package org.nl.wms.ql.service.report.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.ql.service.report.IMdMeInspectionsheetService;
import org.nl.wms.ql.service.report.dao.MdMeInspectionsheet;
import org.nl.wms.ql.service.report.dao.mapper.MdMeInspectionsheetMapper;
import org.springframework.stereotype.Service;
/**
* <p>
* 质检报告 服务实现类
* </p>
*
* @author generator
* @since 2023-04-23
*/
@Service
public class MdMeInspectionsheetServiceImpl extends ServiceImpl<MdMeInspectionsheetMapper, MdMeInspectionsheet> implements IMdMeInspectionsheetService {
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.quality_manage.controller.inspection;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 检验项点表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-06
*/
@RestController
@RequestMapping("/qlTestInspectionitempoint")
public class QlTestInspectionitempointController {
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlController.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.quality_manage.controller.inspection;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 检验方案明细表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-06
*/
@RestController
@RequestMapping("/qlTestInspectionschemedtl")
public class QlTestInspectionschemedtlController {
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.quality_manage.controller.inspection;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 产品检验方案标准表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-06
*/
@RestController
@RequestMapping("/qlTestInspectionschemedtlproductstandard")
public class QlTestInspectionschemedtlproductstandardController {
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.quality_manage.controller.inspection;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 检验方案主表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-06
*/
@RestController
@RequestMapping("/qlTestInspectionschememst")
public class QlTestInspectionschememstController {
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetdtlController.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.quality_manage.controller.report;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 质检单明细表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-06
*/
@RestController
@RequestMapping("/qlTestInspectionsheetdtl")
public class QlTestInspectionsheetdtlController {
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.quality_manage.controller.report;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 质检单主表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-06
*/
@RestController
@RequestMapping("/qlTestInspectionsheetmst")
public class QlTestInspectionsheetmstController {
}

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/ql.xls
View File

Binary file not shown.

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.quality_manage.service.inspection;
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 检验项点表 服务类
* </p>
*
* @author generator
* @since 2023-05-06
*/
public interface IQlTestInspectionitempointService extends IService<QlTestInspectionitempoint> {
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.quality_manage.service.inspection;
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtl;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 检验方案明细表 服务类
* </p>
*
* @author generator
* @since 2023-05-06
*/
public interface IQlTestInspectionschemedtlService extends IService<QlTestInspectionschemedtl> {
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlproductstandardService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.quality_manage.service.inspection;
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtlproductstandard;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 产品检验方案标准表 服务类
* </p>
*
* @author generator
* @since 2023-05-06
*/
public interface IQlTestInspectionschemedtlproductstandardService extends IService<QlTestInspectionschemedtlproductstandard> {
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschememstService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.quality_manage.service.inspection;
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschememst;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 检验方案主表 服务类
* </p>
*
* @author generator
* @since 2023-05-06
*/
public interface IQlTestInspectionschememstService extends IService<QlTestInspectionschememst> {
}

100
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionitempoint.java Normal file
View File

@@ -0,0 +1,100 @@
package org.nl.wms.quality_manage.service.inspection.dao;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 检验项点表
* </p>
*
* @author generator
* @since 2023-05-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ql_test_inspectionitempoint")
public class QlTestInspectionitempoint implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 项点标识
*/
private String inspection_item_id;
/**
* 项点编码
*/
private String inspection_item_code;
/**
* 项点名称
*/
private String inspection_item_name;
/**
* 项点类别
*/
private String inspection_item_type;
/**
* 检验方式
*/
private String inspection_type;
/**
* 物料编号
*/
private String material_code;
/**
* 物料id
*/
private String material_id;
/**
* 备注
*/
private String remark;
/**
* 创建人
*/
private String create_id;
/**
* 创建人姓名
*/
private String create_name;
/**
* 创建时间
*/
private Date create_time;
/**
* 修改人
*/
private String update_id;
/**
* 修改人姓名
*/
private String update_name;
/**
* 修改时间
*/
private Date update_time;
/**
* 是否临界值填充备注
*/
private Boolean is_limit_remark;
}

69
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtl.java Normal file
View File

@@ -0,0 +1,69 @@
package org.nl.wms.quality_manage.service.inspection.dao;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 检验方案明细表
* </p>
*
* @author generator
* @since 2023-05-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ql_test_inspectionschemedtl")
public class QlTestInspectionschemedtl implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 检验方案明细标识
*/
private String inspection_scheme_dtl_id;
/**
* 检验方案标识
*/
private String inspection_scheme_id;
/**
* 检验方案编码
*/
private String inspection_scheme_code;
/**
* 检验方案名称
*/
private String inspection_scheme_name;
/**
* 项点标识
*/
private String inspection_item_id;
/**
* 项点编码
*/
private String inspection_item_code;
/**
* 项点名称
*/
private String inspection_item_name;
/**
* 备注
*/
private String remark;
/**
* 显示顺序
*/
private Integer order_index;
}

95
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtlproductstandard.java Normal file
View File

@@ -0,0 +1,95 @@
package org.nl.wms.quality_manage.service.inspection.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 产品检验方案标准表
* </p>
*
* @author generator
* @since 2023-05-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ql_test_inspectionschemedtlproductstandard")
public class QlTestInspectionschemedtlproductstandard implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 检验方案明细标准标识
*/
private String inspection_standard_dtl_id;
/**
* 物料标识
*/
private String material_code;
/**
* 物料id
*/
private String material_id;
/**
* 检验方案标识
*/
private String inspection_scheme_id;
/**
* 检验方案编码
*/
private String inspection_scheme_code;
/**
* 检验方案名称
*/
private String inspection_scheme_name;
/**
* 项点标识
*/
private String inspection_item_id;
/**
* 项点编码
*/
private String inspection_item_code;
/**
* 项点名称
*/
private String inspection_item_name;
/**
* 合格上限
*/
private BigDecimal up_limit;
/**
* 合格下限
*/
private BigDecimal down_limit;
/**
* 上限临界值
*/
private BigDecimal up_limit_value;
/**
* 下限临界值
*/
private BigDecimal down_limit_value;
/**
* 备注
*/
private String remark;
}

101
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschememst.java Normal file
View File

@@ -0,0 +1,101 @@
package org.nl.wms.quality_manage.service.inspection.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 检验方案主表
* </p>
*
* @author generator
* @since 2023-05-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ql_test_inspectionschememst")
public class QlTestInspectionschememst implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 检验方案标识
*/
private String inspection_scheme_id;
/**
* 检验方案编码
*/
private String inspection_scheme_code;
/**
* 检验方案名称
*/
private String inspection_scheme_name;
/**
* 检验方案类别
*/
private String inspection_scheme_type;
/**
* 厂家质保项数量
*/
private BigDecimal factory_qty;
/**
* 工序检验项数量
*/
private BigDecimal workprocedure_qty;
/**
* 理化检验项数量
*/
private BigDecimal physical_qty;
/**
* 备注
*/
private String remark;
/**
* 是否启用
*/
private Boolean is_used;
/**
* 创建人
*/
private String create_id;
/**
* 创建人姓名
*/
private String create_name;
/**
* 创建时间
*/
private Date create_time;
/**
* 修改人
*/
private String update_optid;
/**
* 修改人姓名
*/
private String update_optname;
/**
* 修改时间
*/
private Date update_time;
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.quality_manage.service.inspection.dao.mapper;
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 检验项点表 Mapper 接口
* </p>
*
* @author generator
* @since 2023-05-06
*/
public interface QlTestInspectionitempointMapper extends BaseMapper<QlTestInspectionitempoint> {
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionitempointMapper">
</mapper>

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package org.nl.wms.quality_manage.service.inspection.dao.mapper;
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 检验方案明细表 Mapper 接口
* </p>
*
* @author generator
* @since 2023-05-06
*/
public interface QlTestInspectionschemedtlMapper extends BaseMapper<QlTestInspectionschemedtl> {
}

Some files were not shown because too many files have changed in this diff Show More