修改登陆界面

master
Admin 5 years ago
parent 7e7974efb7
commit 4747d1bf3d

@ -1,178 +1,182 @@
package com.ruoyi.web.controller.baseinfo; package com.ruoyi.web.controller.baseinfo;
import java.util.List; import java.util.ArrayList;
import java.util.List;
import com.ruoyi.baseinfo.domain.BaseMaterialInfo;
import com.ruoyi.baseinfo.service.IBaseMaterialInfoService; import com.ruoyi.baseinfo.domain.BaseMaterialInfo;
import com.ruoyi.baseinfo.service.IBaseMaterialtypeInfoService; import com.ruoyi.baseinfo.service.IBaseMaterialInfoService;
import com.ruoyi.system.domain.SysDept; import com.ruoyi.baseinfo.service.IBaseMaterialtypeInfoService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import com.ruoyi.common.core.domain.CxSelect;
import org.springframework.beans.factory.annotation.Autowired; import com.ruoyi.system.domain.SysDept;
import org.springframework.stereotype.Controller; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.ui.ModelMap; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.PostMapping;
import com.ruoyi.common.annotation.Log; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.enums.BusinessType; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.baseinfo.domain.BaseBomInfo; import com.ruoyi.common.annotation.Log;
import com.ruoyi.baseinfo.service.IBaseBomInfoService; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.baseinfo.domain.BaseBomInfo;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.baseinfo.service.IBaseBomInfoService;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
/** import com.ruoyi.common.core.page.TableDataInfo;
* BOMController
* /**
* @author CaesarBao * BOMController
* @date 2020-11-04 *
*/ * @author CaesarBao
@Controller * @date 2020-11-04
@RequestMapping("/baseinfo/bominfo") */
public class BaseBomInfoController extends BaseController @Controller
{ @RequestMapping("/baseinfo/bominfo")
private String prefix = "baseinfo/bominfo"; public class BaseBomInfoController extends BaseController
{
@Autowired private String prefix = "baseinfo/bominfo";
private IBaseBomInfoService baseBomInfoService;
@Autowired @Autowired
private IBaseMaterialtypeInfoService baseMaterialtypeInfoService; private IBaseBomInfoService baseBomInfoService;
@Autowired @Autowired
private IBaseMaterialInfoService baseMaterialInfoService; private IBaseMaterialtypeInfoService baseMaterialtypeInfoService;
@Autowired
@RequiresPermissions("baseinfo:bominfo:view") private IBaseMaterialInfoService baseMaterialInfoService;
@GetMapping()
public String bominfo() @RequiresPermissions("baseinfo:bominfo:view")
{ @GetMapping()
return prefix + "/bominfo"; public String bominfo()
} {
return prefix + "/bominfo";
/** }
* BOM
*/ /**
// @RequiresPermissions("baseinfo:bominfo:list") * BOM
// @PostMapping("/list") */
// @ResponseBody // @RequiresPermissions("baseinfo:bominfo:list")
// public TableDataInfo list1(BaseBomInfo baseBomInfo) // @PostMapping("/list")
// { // @ResponseBody
// startPage(); // public TableDataInfo list1(BaseBomInfo baseBomInfo)
// List<BaseBomInfo> list = baseBomInfoService.selectBaseBomInfoList(baseBomInfo); // {
// return getDataTable(list); // startPage();
// } // List<BaseBomInfo> list = baseBomInfoService.selectBaseBomInfoList(baseBomInfo);
// return getDataTable(list);
@RequiresPermissions("baseinfo:bominfo:list") // }
@PostMapping("/list")
@ResponseBody @RequiresPermissions("baseinfo:bominfo:list")
public List<BaseBomInfo> list(BaseBomInfo baseBomInfo) @PostMapping("/list")
{ @ResponseBody
List<BaseBomInfo> list = baseBomInfoService.selectBaseBomInfoList(baseBomInfo); public List<BaseBomInfo> list(BaseBomInfo baseBomInfo)
return list; {
} List<BaseBomInfo> list = baseBomInfoService.selectBaseBomInfoList(baseBomInfo);
/** return list;
* BOM }
*/ /**
@RequiresPermissions("baseinfo:bominfo:export") * BOM
@Log(title = "BOM基础信息", businessType = BusinessType.EXPORT) */
@PostMapping("/export") @RequiresPermissions("baseinfo:bominfo:export")
@ResponseBody @Log(title = "BOM基础信息", businessType = BusinessType.EXPORT)
public AjaxResult export(BaseBomInfo baseBomInfo) @PostMapping("/export")
{ @ResponseBody
List<BaseBomInfo> list = baseBomInfoService.selectBaseBomInfoList(baseBomInfo); public AjaxResult export(BaseBomInfo baseBomInfo)
ExcelUtil<BaseBomInfo> util = new ExcelUtil<BaseBomInfo>(BaseBomInfo.class); {
return util.exportExcel(list, "bominfo"); List<BaseBomInfo> list = baseBomInfoService.selectBaseBomInfoList(baseBomInfo);
} ExcelUtil<BaseBomInfo> util = new ExcelUtil<BaseBomInfo>(BaseBomInfo.class);
return util.exportExcel(list, "bominfo");
/** }
* BOM
*/ /**
@GetMapping("/add") * BOM
public String add(ModelMap mmap) */
{ @GetMapping("/add")
BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo(); public String add(ModelMap mmap)
mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList()); {
mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo)); BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo();
return prefix + "/addproduct"; mmap.put("data",baseMaterialtypeInfoService.selectCxSelectList());
} mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList());
/** mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo));
* BOM return prefix + "/addproduct";
*/ }
@RequiresPermissions("baseinfo:bominfo:addproduct") /**
@Log(title = "BOM基础信息", businessType = BusinessType.INSERT) * BOM
@PostMapping("/addproduct") */
@ResponseBody @RequiresPermissions("baseinfo:bominfo:addproduct")
public AjaxResult addSaveproduct(BaseBomInfo baseBomInfo) @Log(title = "BOM基础信息", businessType = BusinessType.INSERT)
{ @PostMapping("/addproduct")
baseBomInfo.setpId(0L); @ResponseBody
return toAjax(baseBomInfoService.insertBaseBomInfo(baseBomInfo)); public AjaxResult addSaveproduct(BaseBomInfo baseBomInfo)
} {
/** baseBomInfo.setpId(0L);
* BOM return toAjax(baseBomInfoService.insertBaseBomInfo(baseBomInfo));
*/ }
@GetMapping("/add/{parentId}") /**
public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) * BOM
{ */
BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo(); @GetMapping("/add/{parentId}")
mmap.put("parent", baseBomInfoService.selectBaseBomInfoById(parentId)); public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList()); {
mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo)); BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo();
return prefix + "/add"; mmap.put("data",baseMaterialtypeInfoService.selectCxSelectList());
} mmap.put("parent", baseBomInfoService.selectBaseBomInfoById(parentId));
/** mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList());
* BOM mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo));
*/ return prefix + "/add";
@RequiresPermissions("baseinfo:bominfo:add") }
@Log(title = "BOM基础信息", businessType = BusinessType.INSERT) /**
@PostMapping("/add") * BOM
@ResponseBody */
public AjaxResult addSave(BaseBomInfo baseBomInfo) @RequiresPermissions("baseinfo:bominfo:add")
{ @Log(title = "BOM基础信息", businessType = BusinessType.INSERT)
BaseBomInfo pbaseBomInfo = new BaseBomInfo(); @PostMapping("/add")
pbaseBomInfo = baseBomInfoService.selectBaseBomInfoBymaterialName(baseBomInfo); @ResponseBody
baseBomInfo.setpId(pbaseBomInfo.getBomId()); public AjaxResult addSave(BaseBomInfo baseBomInfo)
return toAjax(baseBomInfoService.insertBaseBomInfo(baseBomInfo)); {
} // BaseBomInfo pbaseBomInfo = new BaseBomInfo();
// pbaseBomInfo = baseBomInfoService.selectBaseBomInfoById(baseBomInfo.getBomId());
/** // baseBomInfo.setpId(pbaseBomInfo.getBomId());
* BOM return toAjax(baseBomInfoService.insertBaseBomInfo(baseBomInfo));
*/ }
@GetMapping("/edit/{objid}")
public String edit(@PathVariable("objid") Long objid, ModelMap mmap) /**
{ * BOM
BaseBomInfo baseBomInfo = baseBomInfoService.selectBaseBomInfoById(objid); */
mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectEditBaseMaterialtypeInfoList(baseBomInfo.getMaterialTypeId())); @GetMapping("/edit/{objid}")
mmap.put("cbmaterialInfo",baseMaterialInfoService.selectEditBaseMaterialInfoList(baseBomInfo.getMaterialId())); public String edit(@PathVariable("objid") Long objid, ModelMap mmap)
mmap.put("baseBomInfo", baseBomInfo); {
return prefix + "/edit"; BaseBomInfo baseBomInfo = baseBomInfoService.selectBaseBomInfoById(objid);
} mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectEditBaseMaterialtypeInfoList(baseBomInfo.getMaterialTypeId()));
mmap.put("cbmaterialInfo",baseMaterialInfoService.selectEditBaseMaterialInfoList(baseBomInfo.getMaterialId()));
/** mmap.put("baseBomInfo", baseBomInfo);
* BOM return prefix + "/edit";
*/ }
@RequiresPermissions("baseinfo:bominfo:edit")
@Log(title = "BOM基础信息", businessType = BusinessType.UPDATE) /**
@PostMapping("/edit") * BOM
@ResponseBody */
public AjaxResult editSave(BaseBomInfo baseBomInfo) @RequiresPermissions("baseinfo:bominfo:edit")
{ @Log(title = "BOM基础信息", businessType = BusinessType.UPDATE)
return toAjax(baseBomInfoService.updateBaseBomInfo(baseBomInfo)); @PostMapping("/edit")
} @ResponseBody
public AjaxResult editSave(BaseBomInfo baseBomInfo)
/** {
* BOM return toAjax(baseBomInfoService.updateBaseBomInfo(baseBomInfo));
*/ }
@Log(title = "BOM基础信息", businessType = BusinessType.DELETE)
@RequiresPermissions("system:dept:remove") /**
@GetMapping("/remove/{bomId}") * BOM
@ResponseBody */
public AjaxResult remove(@PathVariable("bomId") Long bomId) @Log(title = "BOM基础信息", businessType = BusinessType.DELETE)
{ @RequiresPermissions("system:dept:remove")
if (baseBomInfoService.selectBomCount(bomId) > 0) @GetMapping("/remove/{bomId}")
{ @ResponseBody
return AjaxResult.warn("存在下级节点,不允许删除"); public AjaxResult remove(@PathVariable("bomId") Long bomId)
} {
return toAjax(baseBomInfoService.deleteBaseBomInfoById(bomId)); if (baseBomInfoService.selectBomCount(bomId) > 0)
} {
} return AjaxResult.warn("存在下级节点,不允许删除");
}
return toAjax(baseBomInfoService.deleteBaseBomInfoById(bomId));
}
}

@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=manufacture_db url: jdbc:sqlserver://10.11.0.141:1433;SelectMethod=cursor;DatabaseName=manufacture_db
username: sa username: sa
password: 123456 password: haiwei@123
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

@ -1,138 +1,138 @@
# 项目相关配置 # 项目相关配置
ruoyi: ruoyi:
# 名称 # 名称
name: RuoYi name: HighWayIOT
# 版本 # 版本
version: 4.3.1 version: 4.3.1
# 版权年份 # 版权年份
copyrightYear: 2019 copyrightYear: 2020
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: false
# 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath # 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath
profile: D:/ruoyi/uploadPath profile: D:/ruoyi/uploadPath
# profile: /Users/sxile/MyWorkSpase/WorkSpase/uploadPath/RuoYi-SqlServer # profile: /Users/sxile/MyWorkSpase/WorkSpase/uploadPath/RuoYi-SqlServer
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口默认为80 # 服务器的HTTP端口默认为80
port: 8088 port: 8088
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
tomcat: tomcat:
# tomcat的URI编码 # tomcat的URI编码
uri-encoding: UTF-8 uri-encoding: UTF-8
# tomcat最大线程数默认为200 # tomcat最大线程数默认为200
max-threads: 800 max-threads: 800
# Tomcat启动初始化的线程数默认值25 # Tomcat启动初始化的线程数默认值25
min-spare-threads: 30 min-spare-threads: 30
# 日志配置 # 日志配置
logging: logging:
level: level:
com.ruoyi: debug com.ruoyi: debug
org.springframework: warn org.springframework: warn
# 用户配置 # 用户配置
user: user:
password: password:
# 密码错误{maxRetryCount}次锁定10分钟 # 密码错误{maxRetryCount}次锁定10分钟
maxRetryCount: 5 maxRetryCount: 5
# Spring配置 # Spring配置
spring: spring:
# 模板引擎 # 模板引擎
thymeleaf: thymeleaf:
mode: HTML mode: HTML
encoding: utf-8 encoding: utf-8
# 禁用缓存 # 禁用缓存
cache: false cache: false
# 资源信息 # 资源信息
messages: messages:
# 国际化资源文件路径 # 国际化资源文件路径
basename: static/i18n/messages basename: static/i18n/messages
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
profiles: profiles:
active: druid active: druid
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:
# 单个文件大小 # 单个文件大小
max-file-size: 10MB max-file-size: 10MB
# 设置总上传的文件大小 # 设置总上传的文件大小
max-request-size: 20MB max-request-size: 20MB
# 服务模块 # 服务模块
devtools: devtools:
restart: restart:
# 热部署开关 # 热部署开关
enabled: true enabled: true
# MyBatis # MyBatis
mybatis: mybatis:
# 搜索指定包别名 # 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: com.ruoyi.**.domain
# 配置mapper的扫描找到所有的mapper.xml映射文件 # 配置mapper的扫描找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml configLocation: classpath:mybatis/mybatis-config.xml
# PageHelper分页插件 # PageHelper分页插件
pagehelper: pagehelper:
helperDialect: sqlserver helperDialect: sqlserver
reasonable: true reasonable: true
supportMethodsArguments: true supportMethodsArguments: true
params: count=countSql params: count=countSql
# Shiro # Shiro
shiro: shiro:
user: user:
# 登录地址 # 登录地址
loginUrl: /login loginUrl: /login
# 权限认证失败地址 # 权限认证失败地址
unauthorizedUrl: /unauth unauthorizedUrl: /unauth
# 首页地址 # 首页地址
indexUrl: /index indexUrl: /index
# 验证码开关 # 验证码开关
captchaEnabled: false captchaEnabled: false
# 验证码类型 math 数组计算 char 字符 # 验证码类型 math 数组计算 char 字符
captchaType: math captchaType: math
cookie: cookie:
# 设置Cookie的域名 默认空,即当前访问的域名 # 设置Cookie的域名 默认空,即当前访问的域名
domain: domain:
# 设置cookie的有效访问路径 # 设置cookie的有效访问路径
path: / path: /
# 设置HttpOnly属性 # 设置HttpOnly属性
httpOnly: true httpOnly: true
# 设置Cookie的过期时间天为单位 # 设置Cookie的过期时间天为单位
maxAge: 30 maxAge: 30
# 设置密钥务必保持唯一性生成方式直接拷贝到main运行即可KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded())); # 设置密钥务必保持唯一性生成方式直接拷贝到main运行即可KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded()));
cipherKey: zSyK5Kp6PZAAjlT+eeNMlg== cipherKey: zSyK5Kp6PZAAjlT+eeNMlg==
session: session:
# Session超时时间-1代表永不过期默认30分钟 # Session超时时间-1代表永不过期默认30分钟
expireTime: 30 expireTime: 30
# 同步session到数据库的周期默认1分钟 # 同步session到数据库的周期默认1分钟
dbSyncPeriod: 1 dbSyncPeriod: 1
# 相隔多久检查一次session的有效性默认就是10分钟 # 相隔多久检查一次session的有效性默认就是10分钟
validationInterval: 10 validationInterval: 10
# 同一个用户最大会话数比如2的意思是同一个账号允许最多同时两个人登录默认-1不限制 # 同一个用户最大会话数比如2的意思是同一个账号允许最多同时两个人登录默认-1不限制
maxSession: -1 maxSession: -1
# 踢出之前登录的/之后登录的用户,默认踢出之前登录的用户 # 踢出之前登录的/之后登录的用户,默认踢出之前登录的用户
kickoutAfter: false kickoutAfter: false
# 防止XSS攻击 # 防止XSS攻击
xss: xss:
# 过滤开关 # 过滤开关
enabled: true enabled: true
# 排除链接(多个用逗号分隔) # 排除链接(多个用逗号分隔)
excludes: /system/notice/* excludes: /system/notice/*
# 匹配链接 # 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/* urlPatterns: /system/*,/monitor/*,/tool/*
# Swagger配置 # Swagger配置
swagger: swagger:
# 是否开启swagger # 是否开启swagger
enabled: true enabled: true

@ -1 +1,174 @@
html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:750px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important} html {
height: 100%
}
body.signin {
height: auto;
/*background: url(../img/login-background.jpg) no-repeat center fixed;*/
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
color: rgba(255, 255, 255, .95)
}
.signinpanel {
width: 750px;
margin: 10% auto 0
}
.signinpanel .logopanel {
float: none;
width: auto;
padding: 0;
background: 0
}
.signinpanel .signin-info ul {
list-style: none;
padding: 0;
margin: 20px 0
}
.signinpanel .form-control {
display: block;
margin-top: 15px
}
.signinpanel .uname {
background: #fff url(../img/user.png) no-repeat 95% center;
color: #333
}
.signinpanel .pword {
background: #fff url(../img/locked.png) no-repeat 95% center;
color: #333
}
.signinpanel .code {
background: #fff no-repeat 95% center;
color: #333;
margin: 0 0 15px 0
}
.signinpanel .btn {
margin-top: 15px
}
.signinpanel form {
background: rgba(255, 255, 255, .2);
border: 1px solid rgba(255, 255, 255, .3);
-moz-box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
-webkit-box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
box-shadow: 0 3px 0 rgba(12, 12, 12, .03);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
padding: 30px
}
.signup-footer {
border-top: solid 1px rgba(255, 255, 255, .3);
margin: 20px 0;
padding-top: 15px
}
@media screen and (max-width: 768px) {
.signinpanel, .signuppanel {
margin: 0 auto;
width: 420px !important;
padding: 20px
}
.signinpanel form {
margin-top: 20px
}
.signup-footer, .signuppanel .form-control {
margin-bottom: 10px
}
.signup-footer .pull-left, .signup-footer .pull-right {
float: none !important;
text-align: center
}
.signinpanel .signin-info ul {
display: none
}
}
@media screen and (max-width: 320px) {
.signinpanel, .signuppanel {
margin: 0 20px;
width: auto
}
}
.checkbox-custom {
position: relative;
padding: 0 15px 0 25px;
margin-bottom: 7px;
display: inline-block
}
.checkbox-custom input[type="checkbox"] {
opacity: 0;
position: absolute;
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px
}
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 18px;
height: 17px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff
}
.checkbox-custom input[type="checkbox"]:checked + label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left
}
.form-control, .form-control:focus, .has-error .form-control:focus, .has-success .form-control:focus, .has-warning .form-control:focus, .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus, .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle, .panel, .popover, .progress, .progress-bar {
box-shadow: none
}
.form-control {
border-radius: 1px !important;
padding: 6px 12px !important;
height: 34px !important
}
.form-control:focus {
border-color: #1ab394 !important
}

@ -1,67 +1,82 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('新增BOM基础信息')" /> <th:block th:include="include :: header('新增BOM基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" /> <th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" /> <th:block th:include="include :: select2-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-bominfo-add"> <form class="form-horizontal m" id="form-bominfo-add">
<!-- <div class="form-group"> --> <input id="pId" name="pId" type="hidden" th:value="${parent.bomId}" />
<!-- <label class="col-sm-3 control-label">父节点ID</label>--> <!-- <div class="form-group"> -->
<!-- <div class="col-sm-8">--> <!-- <label class="col-sm-3 control-label">父节点ID</label>-->
<!-- <input name="pId" class="form-control" type="text">--> <!-- <div class="col-sm-8">-->
<!-- </div>--> <!-- <input name="pId" class="form-control" type="text">-->
<!-- </div>--> <!-- </div>-->
<div class="form-group"> <!-- </div>-->
<label class="col-sm-3 control-label">上级物料:</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">上级物料:</label>
<div class="input-group"> <div class="col-sm-8">
<input name="materialName" class="form-control" type="text" readonly="true" th:value="${parent.materialName}"> <div class="input-group">
</div> <input name="materialName" class="form-control" type="text" readonly="true" th:value="${parent.materialName}">
</div> </div>
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">物料类型名称:</label> <div id="element" class="row">
<div class="col-sm-8"> <div class="form-group">
<select name="materialTypeId" id="workingProcedureId" class="form-control "> <label class="col-sm-3 control-label">物料类型:</label>
<option value="">--请选择物料类型名称--</option> <div class="col-sm-8">
<option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}"></option> <select name="materialTypeId" class="type form-control m-b" data-first-title="请选择">
</select> <option value="">--请选择物料类型--</option>
</div> <option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}">
</div> </option>
<div class="form-group"> </select>
<label class="col-sm-3 control-label">物料名称:</label> </div>
<div class="col-sm-8"> </div>
<select name="materialId" id="materialId" class="form-control "> <div class="form-group">
<option value="">--请选择物料名称--</option> <label class="col-sm-3 control-label">物料名称:</label>
<option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}"></option> <div class="col-sm-8">
</select> <select name="materialId" class="router form-control m-b" data-first-title="请选择">
</div> <option value="">--请选择物料名称--</option>
</div> <option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}">
<div class="form-group"> </option>
<label class="col-sm-3 control-label">备注:</label> </select>
<div class="col-sm-8"> </div>
<input name="remark" class="form-control" type="text"> </div>
</div> </div>
</div> <div class="form-group">
</form> <label class="col-sm-3 control-label">备注:</label>
</div> <div class="col-sm-8">
<th:block th:include="include :: footer" /> <input name="remark" class="form-control" type="text">
<th:block th:include="include :: jasny-bootstrap-js" /> </div>
<th:block th:include="include :: select2-js" /> </div>
<script th:inline="javascript"> </form>
var prefix = ctx + "baseinfo/bominfo" </div>
$("#form-bominfo-add").validate({ <th:block th:include="include :: footer" />
focusCleanup: true <th:block th:include="include :: jasny-bootstrap-js" />
}); <th:block th:include="include :: select2-js" />
<th:block th:include="include :: jquery-cxselect-js" />
function submitHandler() { <script th:inline="javascript">
if ($.validate.form()) { // 直接返回获取
$.operate.save(prefix + "/add", $('#form-bominfo-add').serialize()); var data = [[${data}]];
} console.log(data);
} $('#element').cxSelect({
</script> selects: ['type', 'router'],
</body> jsonValue: 'v',
data: data
});
var prefix = ctx + "baseinfo/bominfo"
$("#form-bominfo-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-bominfo-add').serialize());
}
}
</script>
</body>
</html> </html>

@ -1,67 +1,103 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('新增BOM基础信息')" /> <th:block th:include="include :: header('新增BOM基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" /> <th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" /> <th:block th:include="include :: select2-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-bominfo-add"> <form class="form-horizontal m" id="form-bominfo-add">
<!-- <div class="form-group"> --> <!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">父节点ID</label>--> <!-- <label class="col-sm-3 control-label">父节点ID</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <input name="pId" class="form-control" type="text">--> <!-- <input name="pId" class="form-control" type="text">-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="form-group">--> <!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">上级物料:</label>--> <!-- <label class="col-sm-3 control-label">上级物料:</label>-->
<!-- <div class="col-sm-8">--> <!-- <div class="col-sm-8">-->
<!-- <div class="input-group">--> <!-- <div class="input-group">-->
<!-- <input name="materialName" class="form-control" type="text" readonly="true" th:value="${parent.materialName}">--> <!-- <input name="materialName" class="form-control" type="text" readonly="true" th:value="${parent.materialName}">-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div class="form-group"> <div id="element" class="row">
<label class="col-sm-3 control-label">物料类型ID</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">物料类型:</label>
<select name="materialTypeId" id="workingProcedureId" class="form-control "> <div class="col-sm-8">
<option value="">--请选择物料类型--</option> <select name="materialTypeId" class="type form-control m-b" data-first-title="请选择">
<option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}"></option> <option value="">--请选择物料类型--</option>
</select> <option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}">
</div> </option>
</div> </select>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">物料ID</label> </div>
<div class="col-sm-8"> <div class="form-group">
<select name="materialId" id="materialId" class="form-control "> <label class="col-sm-3 control-label">物料名称:</label>
<option value="">--请选择物料类型--</option> <div class="col-sm-8">
<option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}"></option> <select name="materialId" class="router form-control m-b" data-first-title="请选择">
</select> <option value="">--请选择物料名称--</option>
</div> <option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}">
</div> </option>
<div class="form-group"> </select>
<label class="col-sm-3 control-label">备注:</label> </div>
<div class="col-sm-8"> </div>
<input name="remark" class="form-control" type="text"> </div>
</div>
</div> <!-- <div class="form-group">-->
</form> <!-- <div id="element1" class="row">-->
</div> <!-- <label class="col-sm-3 control-label">物料类型:</label>-->
<th:block th:include="include :: footer" /> <!-- <div class="col-sm-8" >-->
<th:block th:include="include :: jasny-bootstrap-js" /> <!-- <select name="materialTypeId" id="materialTypeId" class="form-control ">-->
<th:block th:include="include :: select2-js" /> <!-- <option value="">&#45;&#45;请选择物料类型&#45;&#45;</option>-->
<script th:inline="javascript"> <!-- <option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}"></option>-->
var prefix = ctx + "baseinfo/bominfo" <!-- </select>-->
$("#form-bominfo-add").validate({ <!-- </div>-->
focusCleanup: true <!-- <label class="col-sm-3 control-label">物料名称:</label>-->
}); <!-- <div class="col-sm-8">-->
<!-- <select name="materialId" id="materialId" class="form-control ">-->
function submitHandler() { <!-- <option value="">&#45;&#45;请选择物料名称&#45;&#45;</option>-->
if ($.validate.form()) { <!-- <option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}"></option>-->
$.operate.save(prefix + "/addproduct", $('#form-bominfo-add').serialize()); <!-- </select>-->
} <!-- </div>-->
} <!-- </div>-->
</script> <!-- </div>-->
</body> <!-- <div class="form-group"> -->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<input name="remark" class="router form-control m-b" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: jquery-cxselect-js" />
<script th:inline="javascript">
// 直接返回获取
var data = [[${data}]];
console.log(data);
$('#element').cxSelect({
selects: ['type', 'router'],
jsonValue: 'v',
data: data
});
var prefix = ctx + "baseinfo/bominfo"
$("#form-bominfo-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/addproduct", $('#form-bominfo-add').serialize());
}
}
</script>
</body>
</html> </html>

@ -1,130 +1,134 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('BOM基础信息列表')" /> <th:block th:include="include :: header('BOM基础信息列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<!-- <li>--> <li>
<!-- <label>父节点ID</label>--> <label>物料类型:</label>
<!-- <input type="text" name="pId"/>--> <input type="text" name="materialTypeName"/>
<!-- </li>--> </li>
<li> <li>
<label>物料类型:</label> <label>物料名称:</label>
<select name="materialTypeId"> <input type="text" name="materialName"/>
<option value="">所有</option> <!-- <select name="materialName">-->
</select> <!-- <option value="">所有</option>-->
</li> <!-- </select>-->
<li> </li>
<label>物料ID</label> <li>
<select name="materialId"> <label></label>
<option value="">所有</option> <input type="text" name="materialCode"/>
</select> </li>
</li> <li>
<li> <label>状态标志:</label>
<label>状态标志:</label> <select name="status" th:with="type=${@dict.getType('sys_status_info')}">
<select name="status" th:with="type=${@dict.getType('sys_status_info')}"> <option value="">所有</option>
<option value="">所有</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </select>
</select> </li>
</li> <li>
<li> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.treeTable.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> </li>
</li> </ul>
</ul> </div>
</div> </form>
</form> </div>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<div class="btn-group-sm" id="toolbar" role="group"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="baseinfo:bominfo:add">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="baseinfo:bominfo:add"> <i class="fa fa-plus"></i> 添加产品
<i class="fa fa-plus"></i> 添加产品 </a>
</a> <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="baseinfo:bominfo:edit">
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="baseinfo:bominfo:edit"> <i class="fa fa-edit"></i> 修改
<i class="fa fa-edit"></i> 修改 </a>
</a> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="baseinfo:bominfo:remove">
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="baseinfo:bominfo:remove"> <i class="fa fa-remove"></i> 删除
<i class="fa fa-remove"></i> 删除 </a>
</a> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="baseinfo:bominfo:export">
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="baseinfo:bominfo:export"> <i class="fa fa-download"></i> 导出
<i class="fa fa-download"></i> 导出 </a>
</a> <a class="btn btn-info" id="expandAllBtn">
<a class="btn btn-info" id="expandAllBtn"> <i class="fa fa-exchange"></i> 展开/折叠
<i class="fa fa-exchange"></i> 展开/折叠 </a>
</a> </div>
</div> <div class="col-sm-12 select-table table-striped">
<div class="col-sm-12 select-table table-striped"> <table id="bootstrap-tree-table"></table>
<table id="bootstrap-tree-table"></table> </div>
</div> </div>
</div> </div>
</div> <th:block th:include="include :: footer" />
<th:block th:include="include :: footer" /> <script th:inline="javascript">
<script th:inline="javascript"> var addFlag = [[${@permission.hasPermi('baseinfo:bominfo:add')}]];
var addFlag = [[${@permission.hasPermi('baseinfo:bominfo:add')}]]; var editFlag = [[${@permission.hasPermi('baseinfo:bominfo:edit')}]];
var editFlag = [[${@permission.hasPermi('baseinfo:bominfo:edit')}]]; var removeFlag = [[${@permission.hasPermi('baseinfo:bominfo:remove')}]];
var removeFlag = [[${@permission.hasPermi('baseinfo:bominfo:remove')}]]; var statusDatas = [[${@dict.getType('sys_status_info')}]];
var statusDatas = [[${@dict.getType('sys_status_info')}]]; var prefix = ctx + "baseinfo/bominfo";
var prefix = ctx + "baseinfo/bominfo";
$(function() {
$(function() { var options = {
var options = { code: "bomId",
code: "bomId", parentCode: "pId",
parentCode: "pId", uniqueId: "bomId",
uniqueId: "bomId", url: prefix + "/list",
url: prefix + "/list", createUrl: prefix + "/add/{id}",
createUrl: prefix + "/add/{id}", updateUrl: prefix + "/edit/{id}",
updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove/{id}",
removeUrl: prefix + "/remove/{id}", modalName: "BOM",
modalName: "BOM", columns: [{
columns: [{ field: 'selectItem',
field: 'selectItem', radio: false
radio: true },
}, {
{ field: 'materialTypeName',
field: 'materialTypeName', title: '物料类型',
title: '物料类型', align: "left"
align: "left" },
}, {
{ field: 'materialName',
field: 'materialName', title: '物料名称',
title: '物料名称', align: "left"
align: "left" },
}, {
{ field: 'materialCode',
field: 'status', title: '规格型号',
title: '状态标志', align: "left"
align: "left", },
formatter: function(value, row, index) { {
return $.table.selectDictLabel(statusDatas, value); field: 'status',
} title: '状态标志',
}, align: "left",
{ formatter: function(value, row, index) {
field: 'remark', return $.table.selectDictLabel(statusDatas, value);
title: '备注', }
align: "left" },
}, {
{ field: 'remark',
title: '操作', title: '备注',
align: "left", align: "left"
formatter: function(value, row, index) { },
var actions = []; {
actions.push('<a class="btn btn-info btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.bomId + '\')"><i class="fa fa-plus"></i>新增物料</a> '); title: '操作',
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.bomId + '\')"><i class="fa fa-edit"></i>编辑</a> '); align: "left",
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.bomId + '\')"><i class="fa fa-remove"></i>删除</a>'); formatter: function(value, row, index) {
return actions.join(''); var actions = [];
} actions.push('<a class="btn btn-info btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.bomId + '\')"><i class="fa fa-plus"></i>新增物料</a> ');
} actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.bomId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
] actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.bomId + '\')"><i class="fa fa-remove"></i>删除</a>');
}; return actions.join('');
$.treeTable.init(options); }
}); }
</script> ]
};
</body> $.treeTable.init(options);
});
</script>
</body>
</html> </html>

@ -24,7 +24,7 @@
<input type="text" name="price"/> <input type="text" name="price"/>
</li> </li>
<li> <li>
<label>设备规格型号:</label> <label>规格型号:</label>
<input type="text" name="deviceType"/> <input type="text" name="deviceType"/>
</li> </li>
<li> <li>

@ -1,77 +1,79 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改设备基础信息')" /> <th:block th:include="include :: header('修改设备基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" /> <th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: select2-css" />
</head> <th:block th:include="include :: datetimepicker-css" />
<body class="white-bg"> </head>
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <body class="white-bg">
<form class="form-horizontal m" id="form-deviceinfo-edit" th:object="${baseDeviceInfo}"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<input name="objid" th:field="*{objid}" type="hidden"> <form class="form-horizontal m" id="form-deviceinfo-edit" th:object="${baseDeviceInfo}">
<div class="form-group"> <input name="objid" th:field="*{objid}" type="hidden">
<label class="col-sm-3 control-label">设备ID</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">设备ID</label>
<input name="deviceId" th:field="*{deviceId}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="deviceId" th:field="*{deviceId}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">设备名称:</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">设备名称:</label>
<input name="deviceName" th:field="*{deviceName}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="deviceName" th:field="*{deviceName}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">所属工序:</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">所属工序:</label>
<select name="workingProcedureId" id="workingProcedureId" th:id="postId" class="form-control m-b"> <div class="col-sm-8">
<option name="cbEditWorkingProcedureInfo" th:each="workingProcedureId:${cbEditWorkingProcedureInfo}" th:value="${workingProcedureId.workingProcedureId}" th:text="${workingProcedureId.workingProcedureName}" th:selected="${workingProcedureId.flag}" th:disabled="${workingProcedureId.status == '1'}"></option> <select name="workingProcedureId" id="workingProcedureId" th:id="postId" class="form-control m-b">
</select> <option name="cbEditWorkingProcedureInfo" th:each="workingProcedureId:${cbEditWorkingProcedureInfo}" th:value="${workingProcedureId.workingProcedureId}" th:text="${workingProcedureId.workingProcedureName}" th:selected="${workingProcedureId.flag}" th:disabled="${workingProcedureId.status == '1'}"></option>
</div> </select>
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">价格:</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">价格:</label>
<input name="price" th:field="*{price}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="price" th:field="*{price}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">设备规格型号:</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">设备规格型号:</label>
<input name="deviceType" th:field="*{deviceType}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="deviceType" th:field="*{deviceType}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">备注:</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">备注:</label>
<input name="remark" th:field="*{remark}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="remark" th:field="*{remark}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">状态标志:</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">状态标志:</label>
<div class="radio-box" th:each="dict : ${@dict.getType('sys_status_info')}"> <div class="col-sm-8">
<input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_status_info')}">
<label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> <input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
</div> <label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div> </div>
</div> </div>
</form> </div>
</div> </form>
<th:block th:include="include :: footer" /> </div>
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <th:block th:include="include :: jasny-bootstrap-js" />
var prefix = ctx + "baseinfo/deviceinfo"; <th:block th:include="include :: select2-js" />
$("#form-deviceinfo-edit").validate({ <script th:inline="javascript">
focusCleanup: true var prefix = ctx + "baseinfo/deviceinfo";
}); $("#form-deviceinfo-edit").validate({
focusCleanup: true
function submitHandler() { });
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-deviceinfo-edit').serialize()); function submitHandler() {
} if ($.validate.form()) {
} $.operate.save(prefix + "/edit", $('#form-deviceinfo-edit').serialize());
</script> }
</body> }
</script>
</body>
</html> </html>

@ -3,6 +3,7 @@
<head> <head>
<th:block th:include="include :: header('修改职员基础信息')" /> <th:block th:include="include :: header('修改职员基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" /> <th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
@ -73,6 +74,7 @@
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: jasny-bootstrap-js" /> <th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "baseinfo/employeeinfo"; var prefix = ctx + "baseinfo/employeeinfo";
$("#form-employeeinfo-edit").validate({ $("#form-employeeinfo-edit").validate({

@ -2,6 +2,8 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('职员基础信息列表')" /> <th:block th:include="include :: header('职员基础信息列表')" />
<th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
@ -22,10 +24,10 @@
<label>职员卡号:</label> <label>职员卡号:</label>
<input type="text" name="carNo"/> <input type="text" name="carNo"/>
</li> </li>
<li> <!-- <li>-->
<label>所属部门:</label> <!-- <label>所属部门:</label>-->
<input type="text" name="deptId"/> <!-- <input type="text" name="deptId"/>-->
</li> <!-- </li>-->
<li> <li>
<label>职位:</label> <label>职位:</label>
<select name="postId"> <select name="postId">
@ -76,6 +78,8 @@
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('baseinfo:employeeinfo:edit')}]]; var editFlag = [[${@permission.hasPermi('baseinfo:employeeinfo:edit')}]];
var removeFlag = [[${@permission.hasPermi('baseinfo:employeeinfo:remove')}]]; var removeFlag = [[${@permission.hasPermi('baseinfo:employeeinfo:remove')}]];

@ -2,6 +2,8 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('新增物料基础信息')" /> <th:block th:include="include :: header('新增物料基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -42,6 +44,8 @@
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "baseinfo/materialinfo" var prefix = ctx + "baseinfo/materialinfo"
$("#form-materialinfo-add").validate({ $("#form-materialinfo-add").validate({

@ -2,6 +2,8 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改物料基础信息')" /> <th:block th:include="include :: header('修改物料基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -45,6 +47,8 @@
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "baseinfo/materialinfo"; var prefix = ctx + "baseinfo/materialinfo";
$("#form-materialinfo-edit").validate({ $("#form-materialinfo-edit").validate({

@ -2,6 +2,8 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('新增物料类型基础信息')" /> <th:block th:include="include :: header('新增物料类型基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -36,6 +38,8 @@
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "baseinfo/materialtypeinfo" var prefix = ctx + "baseinfo/materialtypeinfo"
$("#form-materialtypeinfo-add").validate({ $("#form-materialtypeinfo-add").validate({

@ -2,6 +2,8 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head> <head>
<th:block th:include="include :: header('修改物料类型基础信息')" /> <th:block th:include="include :: header('修改物料类型基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -39,6 +41,8 @@
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "baseinfo/materialtypeinfo"; var prefix = ctx + "baseinfo/materialtypeinfo";
$("#form-materialtypeinfo-edit").validate({ $("#form-materialtypeinfo-edit").validate({

@ -11,11 +11,11 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>物料类型ID</label> <label>类型ID</label>
<input type="text" name="materialTypeId"/> <input type="text" name="materialTypeId"/>
</li> </li>
<li> <li>
<label>物料类型名称:</label> <label>类型名称:</label>
<input type="text" name="materialTypeName"/> <input type="text" name="materialTypeName"/>
</li> </li>
<li> <li>

@ -3,6 +3,7 @@
<head> <head>
<th:block th:include="include :: header('修改职位基础信息')" /> <th:block th:include="include :: header('修改职位基础信息')" />
<th:block th:include="include :: jasny-bootstrap-css" /> <th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="white-bg"> <body class="white-bg">
@ -48,6 +49,7 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: jasny-bootstrap-js" /> <th:block th:include="include :: jasny-bootstrap-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "baseinfo/postinfo"; var prefix = ctx + "baseinfo/postinfo";

@ -7,6 +7,7 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-workingprocedureinfo-edit" th:object="${baseWorkingprocedureInfo}"> <form class="form-horizontal m" id="form-workingprocedureinfo-edit" th:object="${baseWorkingprocedureInfo}">
<input name="objid" th:field="*{objid}" type="hidden"> <input name="objid" th:field="*{objid}" type="hidden">
<input name="deptId" type="hidden" th:field="*{deptId}" id="treeId"/>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">工序ID</label> <label class="col-sm-3 control-label">工序ID</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -20,9 +21,12 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">部门ID</label> <label class="col-sm-3 control-label">所属部门:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="deptId" th:field="*{deptId}" class="form-control" type="text"> <div class="input-group">
<input class="form-control" type="text" name="deptId" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}" required>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -48,6 +52,27 @@
$.operate.save(prefix + "/edit", $('#form-workingprocedureinfo-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-workingprocedureinfo-edit').serialize());
} }
} }
/*用户管理-修改-选择部门树*/
function selectDeptTree() {
var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val();
var url = ctx + "system/dept/selectDeptTree/" + deptId;
var options = {
title: '选择部门',
width: "380",
url: url,
callBack: doSubmit
};
$.modal.openOptions(options);
}
function doSubmit(index, layero){
var tree = layero.find("iframe")[0].contentWindow.$._tree;
if ($.tree.notAllowParents(tree)) {
var body = layer.getChildFrame('body', index);
$("#treeId").val(body.find('#treeId').val());
$("#treeName").val(body.find('#treeName').val());
layer.close(index);
}
}
</script> </script>
</body> </body>
</html> </html>

@ -18,10 +18,10 @@
<label>工序名称:</label> <label>工序名称:</label>
<input type="text" name="workingProcedureName"/> <input type="text" name="workingProcedureName"/>
</li> </li>
<li> <!-- <li>-->
<label>部门ID</label> <!-- <label>部门ID</label>-->
<input type="text" name="deptId"/> <!-- <input type="text" name="deptId"/>-->
</li> <!-- </li>-->
<li> <li>
<label>状态标志:</label> <label>状态标志:</label>
<select name="status" th:with="type=${@dict.getType('sys_status_info')}"> <select name="status" th:with="type=${@dict.getType('sys_status_info')}">

@ -26,7 +26,7 @@
</div> </div>
<a th:href="@{/index}"> <a th:href="@{/index}">
<li class="logo hidden-xs"> <li class="logo hidden-xs">
<span class="logo-lg">RuoYi</span> <span class="logo-lg">生产管理系统</span>
</li> </li>
</a> </a>
<div class="sidebar-collapse"> <div class="sidebar-collapse">
@ -182,8 +182,8 @@
</a> </a>
</div> </div>
<ul class="nav navbar-top-links navbar-right welcome-message"> <ul class="nav navbar-top-links navbar-right welcome-message">
<li><a title="视频教程" href="http://doc.ruoyi.vip/ruoyi/document/spjc.html" target="_blank"><i class="fa fa-video-camera"></i> 视频教程</a></li> <!-- <li><a title="视频教程" href="http://doc.ruoyi.vip/ruoyi/document/spjc.html" target="_blank"><i class="fa fa-video-camera"></i> 视频教程</a></li>-->
<li><a title="开发文档" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-question-circle"></i> 开发文档</a></li> <!-- <li><a title="开发文档" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-question-circle"></i> 开发文档</a></li>-->
<li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li> <li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li>
<li class="dropdown user-menu"> <li class="dropdown user-menu">
<a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown"> <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">

@ -19,31 +19,105 @@
<script> <script>
if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location}; if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
</script> </script>
<style>
body {
background: radial-gradient(200% 100% at bottom center, #f7f7b6, #e96f92, #75517d, #1b2947);
background: radial-gradient(220% 105% at top center, #1b2947 10%, #75517d 40%, #e96f92 65%, #f7f7b6);
background-attachment: fixed;
overflow: hidden;
}
@keyframes rotate {
0% {
transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(0);
}
100% {
transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(-360deg);
}
}
.stars {
transform: perspective(500px);
transform-style: preserve-3d;
position: absolute;
bottom: 0;
perspective-origin: 50% 100%;
left: 50%;
animation: rotate 90s infinite linear;
}
.star {
width: 2px;
height: 2px;
background: #F7F7B6;
position: absolute;
top: 0;
left: 0;
transform-origin: 0 0 -300px;
transform: translate3d(0, 0, -300px);
backface-visibility: hidden;
}
.table{
width: 400px;
height: 350px;
margin: 80px auto;
}
.table form{
width: 100%;
}
.table .name{
width: 280px;
margin: 20px auto 30px auto;
display: block;
height: 30px;
border-radius: 20px;
border: none;
background: rgba(0,0,0,0.2);
text-indent: 0.5em;
}
.table .btn{
width: 100px;
height: 30px;
background: rgba(0,0,0,0.1);
border-radius: 8px;
border: none;
color: white;
margin: 0 auto;
display: block;
}
</style>
</head> </head>
<body class="signin"> <body class="signin" style="margin-top: 250px" >
<div class="stars"></div> <!--背景层,不要删除,不然没有作用-->
<div class="signinpanel"> <div class="signinpanel">
<div class="row"> <div class="row" >
<div class="col-sm-7"> <div class="col-sm-3" >
<div class="signin-info"> <div class="signin-info">
<div class="logopanel m-b"> <!-- <div class="logopanel m-b">-->
<h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1> <!-- <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>-->
</div> <!-- </div>-->
<div class="m-b"></div> <div class="m-b"></div>
<h4>欢迎使用 <strong>若依 后台管理系统</strong></h4> <!-- <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>-->
<ul class="m-b"> <!-- <ul class="m-b">-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>-->
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li> <!-- <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>-->
</ul> <!-- </ul>-->
<strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号? <a th:href="@{/register}">立即注册&raquo;</a></strong> <!-- <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号? <a th:href="@{/register}">立即注册&raquo;</a></strong>-->
</div> </div>
</div> </div>
<div class="col-sm-5"> <div class="col-sm-6" >
<form id="signupForm" autocomplete="off"> <form id="signupForm" autocomplete="off">
<h4 class="no-margins">登录:</h4> <!-- <h4 class="no-margins">登录:</h4>-->
<p class="m-t-md">你若不离不弃,我必生死相依</p> <!-- <p class="m-t-md">你若不离不弃,我必生死相依</p>-->
<!-- <div class="logopanel m-b">-->
<!-- <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>-->
<!-- </div>-->
<p class="m-t-md" style="font-size: 30px" align="center">生产管理系统</p>
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" /> <input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" />
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" /> <input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" />
<div class="row m-t" th:if="${captchaEnabled==true}"> <div class="row m-t" th:if="${captchaEnabled==true}">
@ -64,13 +138,17 @@
</div> </div>
</div> </div>
<div class="signup-footer"> <div class="signup-footer">
<div class="pull-left"> <!-- <div class="pull-left">-->
&copy; 2019 All Rights Reserved. RuoYi <br> <!-- &copy; 2019 All Rights Reserved. RuoYi <br>-->
</div> <!-- </div>-->
</div> </div>
</div> </div>
<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script> <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
<!-- 全局js --> <!-- 全局js -->
<script src="https://www.jq22.com/jquery/jquery-1.10.2.js"></script>
<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script> <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
<script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script> <script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script>
<!-- 验证插件 --> <!-- 验证插件 -->
@ -80,5 +158,26 @@
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script> <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.3.1}"></script> <script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.3.1}"></script>
<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script> <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
<script>
$(document).ready(function(){
var stars=1800; /*星星的密集程度,数字越大越多*/
var $stars=$(".stars");
var r=800; /*星星的看起来的距离,值越大越远,可自行调制到自己满意的样子*/
for(var i=0;i<stars;i++){
var $star=$("<div/>").addClass("star");
$stars.append($star);
}
$(".star").each(function(){
var cur=$(this);
var s=0.2+(Math.random()*1);
var curR=r+(Math.random()*300);
cur.css({
transformOrigin:"0 0 "+curR+"px",
transform:" translate3d(0,0,-"+curR+"px) rotateY("+(Math.random()*360)+"deg) rotateX("+(Math.random()*-50)+"deg) scale("+s+","+s+")"
})
})
})
</script>
</body> </body>
</html> </html>

File diff suppressed because it is too large Load Diff

@ -1,126 +1,130 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('设备产量日报列表')" /> <th:block th:include="include :: header('设备产量日报列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>设备ID</label> <label>设备ID</label>
<input type="text" name="deviceId"/> <input type="text" name="deviceId"/>
</li> </li>
<li> <li>
<label>设备名称:</label> <label>设备名称:</label>
<input type="text" name="deviceName"/> <input type="text" name="deviceName"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>记录时间:</label> <label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:DeviceAmountDayReport:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:DeviceAmountDayReport:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:DeviceAmountDayReport:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:DeviceAmountDayReport:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:DeviceAmountDayReport:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:DeviceAmountDayReport:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:DeviceAmountDayReport:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:DeviceAmountDayReport:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('report:DeviceAmountDayReport:edit')}]]; var editFlag = [[${@permission.hasPermi('report:DeviceAmountDayReport:edit')}]];
var removeFlag = [[${@permission.hasPermi('report:DeviceAmountDayReport:remove')}]]; var removeFlag = [[${@permission.hasPermi('report:DeviceAmountDayReport:remove')}]];
var unitIdDatas = [[${@dict.getType('sys_unit_info')}]]; var unitIdDatas = [[${@dict.getType('sys_unit_info')}]];
var prefix = ctx + "report/DeviceAmountDayReport"; var prefix = ctx + "report/DeviceAmountDayReport";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "设备产量日报", modalName: "设备产量日报",
showFooter: true, showFooter: true,
columns: [{ showSearch: false,
checkbox: true showRefresh: false,
}, showToggle: false,
{ showColumns: false,
field: 'objid', columns: [{
title: '主键ID', checkbox: true
visible: false },
}, {
{ field: 'objid',
field: 'deviceId', title: '主键ID',
title: '设备ID' visible: false
}, },
{ {
field: 'deviceName', field: 'deviceId',
title: '设备名称' title: '设备ID'
}, },
{
{ field: 'deviceName',
field: 'recordtime', title: '设备名称'
title: '记录时间' },
},
{ {
field: 'realAmount', field: 'recordtime',
title: '实际产量', title: '记录时间'
footerFormatter:function (value) { },
var realAmount = 0; {
for (var i in value) { field: 'realAmount',
realAmount += parseFloat(value[i].realAmount); title: '实际产量',
} footerFormatter:function (value) {
return "总产量:" + realAmount; var realAmount = 0;
} for (var i in value) {
}, realAmount += parseFloat(value[i].realAmount);
{ }
field: 'unitId', return "总产量:" + realAmount;
title: '单位', }
formatter: function(value, row, index) { },
return $.table.selectDictLabel(unitIdDatas, value); {
} field: 'unitId',
}, title: '单位',
// { formatter: function(value, row, index) {
// title: '操作', return $.table.selectDictLabel(unitIdDatas, value);
// align: 'center', }
// formatter: function(value, row, index) { },
// var actions = []; // {
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> '); // title: '操作',
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>'); // align: 'center',
// return actions.join(''); // formatter: function(value, row, index) {
// } // var actions = [];
// } // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
] // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
}; // return actions.join('');
$.table.init(options); // }
}); // }
</script> ]
</body> };
$.table.init(options);
});
</script>
</body>
</html> </html>

@ -1,115 +1,115 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('班组产量日报列表')" /> <th:block th:include="include :: header('班组产量日报列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>班组ID</label> <label>班组ID</label>
<input type="text" name="groupid"/> <input type="text" name="groupid"/>
</li> </li>
<li> <li>
<label>班组名称:</label> <label>班组名称:</label>
<input type="text" name="groupname"/> <input type="text" name="groupname"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>记录时间:</label> <label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:GroupAmountDatReport:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:GroupAmountDatReport:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:GroupAmountDatReport:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:GroupAmountDatReport:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:GroupAmountDatReport:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:GroupAmountDatReport:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:GroupAmountDatReport:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:GroupAmountDatReport:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('report:GroupAmountDatReport:edit')}]]; var editFlag = [[${@permission.hasPermi('report:GroupAmountDatReport:edit')}]];
var removeFlag = [[${@permission.hasPermi('report:GroupAmountDatReport:remove')}]]; var removeFlag = [[${@permission.hasPermi('report:GroupAmountDatReport:remove')}]];
var unitIdDatas = [[${@dict.getType('sys_unit_info')}]]; var unitIdDatas = [[${@dict.getType('sys_unit_info')}]];
var prefix = ctx + "report/GroupAmountDatReport"; var prefix = ctx + "report/GroupAmountDatReport";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "班组产量日报", modalName: "班组产量日报",
showFooter: true, showFooter: true,
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'objid', field: 'objid',
title: '主键ID', title: '主键ID',
visible: false visible: false
}, },
{ {
field: 'groupid', field: 'groupid',
title: '班组ID' title: '班组ID'
}, },
{ {
field: 'groupname', field: 'groupname',
title: '班组名称' title: '班组名称'
}, },
{ {
field: 'recordtime', field: 'recordtime',
title: '记录时间' title: '记录时间'
}, },
{ {
field: 'realAmount', field: 'realAmount',
title: '实际产量', title: '实际产量',
footerFormatter:function (value) { footerFormatter:function (value) {
var realAmount = 0; var realAmount = 0;
for (var i in value) { for (var i in value) {
realAmount += parseFloat(value[i].realAmount); realAmount += parseFloat(value[i].realAmount);
} }
return "总产量:" + realAmount; return "总产量:" + realAmount;
} }
}, },
{ {
field: 'unitId', field: 'unitId',
title: '单位', title: '单位',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(unitIdDatas, value); return $.table.selectDictLabel(unitIdDatas, value);
} }
}, },
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

@ -1,115 +1,115 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('规格产量日报列表')" /> <th:block th:include="include :: header('规格产量日报列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>物料ID</label> <label>物料ID</label>
<input type="text" name="materialId"/> <input type="text" name="materialId"/>
</li> </li>
<li> <li>
<label>规格名称:</label> <label>规格名称:</label>
<input type="text" name="materialCode"/> <input type="text" name="materialCode"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>记录时间:</label> <label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:MaterialCodeAmountDatReport:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:MaterialCodeAmountDatReport:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:MaterialCodeAmountDatReport:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:MaterialCodeAmountDatReport:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:MaterialCodeAmountDatReport:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:MaterialCodeAmountDatReport:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:MaterialCodeAmountDatReport:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:MaterialCodeAmountDatReport:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('report:MaterialCodeAmountDatReport:edit')}]]; var editFlag = [[${@permission.hasPermi('report:MaterialCodeAmountDatReport:edit')}]];
var removeFlag = [[${@permission.hasPermi('report:MaterialCodeAmountDatReport:remove')}]]; var removeFlag = [[${@permission.hasPermi('report:MaterialCodeAmountDatReport:remove')}]];
var unitIdDatas = [[${@dict.getType('sys_unit_info')}]]; var unitIdDatas = [[${@dict.getType('sys_unit_info')}]];
var prefix = ctx + "report/MaterialCodeAmountDatReport"; var prefix = ctx + "report/MaterialCodeAmountDatReport";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "规格产量日报", modalName: "规格产量日报",
showFooter: true, showFooter: true,
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'objid', field: 'objid',
title: '主键ID', title: '主键ID',
visible: false visible: false
}, },
{ {
field: 'materialId', field: 'materialId',
title: '物料ID' title: '物料ID'
}, },
{ {
field: 'materialCode', field: 'materialCode',
title: '规格名称' title: '规格名称'
}, },
{ {
field: 'recordtime', field: 'recordtime',
title: '记录时间' title: '记录时间'
}, },
{ {
field: 'realAmount', field: 'realAmount',
title: '实际产量', title: '实际产量',
footerFormatter:function (value) { footerFormatter:function (value) {
var realAmount = 0; var realAmount = 0;
for (var i in value) { for (var i in value) {
realAmount += parseFloat(value[i].realAmount); realAmount += parseFloat(value[i].realAmount);
} }
return "总产量:" + realAmount; return "总产量:" + realAmount;
} }
}, },
{ {
field: 'unitId', field: 'unitId',
title: '单位', title: '单位',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(unitIdDatas, value); return $.table.selectDictLabel(unitIdDatas, value);
} }
}, },
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

@ -1,116 +1,116 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('计划完成率产量日报列表')" /> <th:block th:include="include :: header('计划完成率产量日报列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>计划ID</label> <label>计划ID</label>
<input type="text" name="planid"/> <input type="text" name="planid"/>
</li> </li>
<li> <li>
<label>计划总产量:</label> <label>计划总产量:</label>
<input type="text" name="planAmount"/> <input type="text" name="planAmount"/>
</li> </li>
<li> <li>
<label>实际总产量:</label> <label>实际总产量:</label>
<input type="text" name="realAmount"/> <input type="text" name="realAmount"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>记录时间:</label> <label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:PlanRateAmountDatReport:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:PlanRateAmountDatReport:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:PlanRateAmountDatReport:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:PlanRateAmountDatReport:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:PlanRateAmountDatReport:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:PlanRateAmountDatReport:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:PlanRateAmountDatReport:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:PlanRateAmountDatReport:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('report:PlanRateAmountDatReport:edit')}]]; var editFlag = [[${@permission.hasPermi('report:PlanRateAmountDatReport:edit')}]];
var removeFlag = [[${@permission.hasPermi('report:PlanRateAmountDatReport:remove')}]]; var removeFlag = [[${@permission.hasPermi('report:PlanRateAmountDatReport:remove')}]];
var unitIdDatas = [[${@dict.getType('sys_unit_info')}]]; var unitIdDatas = [[${@dict.getType('sys_unit_info')}]];
var prefix = ctx + "report/PlanRateAmountDatReport"; var prefix = ctx + "report/PlanRateAmountDatReport";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "计划完成率产量日报", modalName: "计划完成率产量日报",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'objid', field: 'objid',
title: '主键ID', title: '主键ID',
visible: false visible: false
}, },
{ {
field: 'planid', field: 'planid',
title: '计划ID' title: '计划ID'
}, },
{ {
field: 'planAmount', field: 'planAmount',
title: '计划总产量' title: '计划总产量'
}, },
{ {
field: 'realAmount', field: 'realAmount',
title: '实际总产量' title: '实际总产量'
}, },
{ {
field: 'unitId', field: 'unitId',
title: '单位', title: '单位',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(unitIdDatas, value); return $.table.selectDictLabel(unitIdDatas, value);
} }
}, },
{ {
field: 'plancompleterate', field: 'plancompleterate',
title: '计划完成率(%)' title: '计划完成率(%)'
}, },
{ {
field: 'recordtime', field: 'recordtime',
title: '记录时间' title: '记录时间'
}, },
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

@ -1,116 +1,116 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('班次产量日报列表')" /> <th:block th:include="include :: header('班次产量日报列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>班次ID</label> <label>班次ID</label>
<input type="text" name="shiftId"/> <input type="text" name="shiftId"/>
</li> </li>
<li> <li>
<label>班次名称:</label> <label>班次名称:</label>
<input type="text" name="shiftName"/> <input type="text" name="shiftName"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>记录时间:</label> <label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:ShiftAmountDatReport:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:ShiftAmountDatReport:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:ShiftAmountDatReport:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:ShiftAmountDatReport:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:ShiftAmountDatReport:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:ShiftAmountDatReport:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:ShiftAmountDatReport:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:ShiftAmountDatReport:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('report:ShiftAmountDatReport:edit')}]]; var editFlag = [[${@permission.hasPermi('report:ShiftAmountDatReport:edit')}]];
var removeFlag = [[${@permission.hasPermi('report:ShiftAmountDatReport:remove')}]]; var removeFlag = [[${@permission.hasPermi('report:ShiftAmountDatReport:remove')}]];
var unitIdDatas = [[${@dict.getType('sys_unit_info')}]]; var unitIdDatas = [[${@dict.getType('sys_unit_info')}]];
var prefix = ctx + "report/ShiftAmountDatReport"; var prefix = ctx + "report/ShiftAmountDatReport";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "班次产量日报", modalName: "班次产量日报",
showFooter: true, showFooter: true,
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'objid', field: 'objid',
title: '主键ID', title: '主键ID',
visible: false visible: false
}, },
{ {
field: 'shiftId', field: 'shiftId',
title: '班次ID' title: '班次ID'
}, },
{ {
field: 'shiftName', field: 'shiftName',
title: '班次名称' title: '班次名称'
}, },
{ {
field: 'recordtime', field: 'recordtime',
title: '记录时间' title: '记录时间'
}, },
{ {
field: 'realAmount', field: 'realAmount',
title: '实际产量', title: '实际产量',
footerFormatter:function (value) { footerFormatter:function (value) {
var realAmount = 0; var realAmount = 0;
for (var i in value) { for (var i in value) {
realAmount += parseFloat(value[i].realAmount); realAmount += parseFloat(value[i].realAmount);
} }
return "总产量:" + realAmount; return "总产量:" + realAmount;
} }
}, },
{ {
field: 'unitId', field: 'unitId',
title: '单位', title: '单位',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(unitIdDatas, value); return $.table.selectDictLabel(unitIdDatas, value);
} }
}, },
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

@ -1,116 +1,116 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('工序产量日报列表')" /> <th:block th:include="include :: header('工序产量日报列表')" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>设备ID</label> <label>设备ID</label>
<input type="text" name="workingProcedureId"/> <input type="text" name="workingProcedureId"/>
</li> </li>
<li> <li>
<label>工序名称:</label> <label>工序名称:</label>
<input type="text" name="workingProcedureName"/> <input type="text" name="workingProcedureName"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>记录时间:</label> <label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginRecordtime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endRecordtime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:WorkProcedureAmountDatReport:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="report:WorkProcedureAmountDatReport:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:WorkProcedureAmountDatReport:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="report:WorkProcedureAmountDatReport:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:WorkProcedureAmountDatReport:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="report:WorkProcedureAmountDatReport:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:WorkProcedureAmountDatReport:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="report:WorkProcedureAmountDatReport:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('report:WorkProcedureAmountDatReport:edit')}]]; var editFlag = [[${@permission.hasPermi('report:WorkProcedureAmountDatReport:edit')}]];
var removeFlag = [[${@permission.hasPermi('report:WorkProcedureAmountDatReport:remove')}]]; var removeFlag = [[${@permission.hasPermi('report:WorkProcedureAmountDatReport:remove')}]];
var unitIdDatas = [[${@dict.getType('sys_unit_info')}]]; var unitIdDatas = [[${@dict.getType('sys_unit_info')}]];
var prefix = ctx + "report/WorkProcedureAmountDatReport"; var prefix = ctx + "report/WorkProcedureAmountDatReport";
$(function() { $(function() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "工序产量日报", modalName: "工序产量日报",
showFooter: true, showFooter: true,
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'objid', field: 'objid',
title: '主键ID', title: '主键ID',
visible: false visible: false
}, },
{ {
field: 'workingProcedureId', field: 'workingProcedureId',
title: '设备ID' title: '设备ID'
}, },
{ {
field: 'workingProcedureName', field: 'workingProcedureName',
title: '工序名称' title: '工序名称'
}, },
{ {
field: 'recordtime', field: 'recordtime',
title: '记录时间' title: '记录时间'
}, },
{ {
field: 'realAmount', field: 'realAmount',
title: '实际产量', title: '实际产量',
footerFormatter:function (value) { footerFormatter:function (value) {
var realAmount = 0; var realAmount = 0;
for (var i in value) { for (var i in value) {
realAmount += parseFloat(value[i].realAmount); realAmount += parseFloat(value[i].realAmount);
} }
return "总产量:" + realAmount; return "总产量:" + realAmount;
} }
}, },
{ {
field: 'unitId', field: 'unitId',
title: '单位', title: '单位',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(unitIdDatas, value); return $.table.selectDictLabel(unitIdDatas, value);
} }
}, },
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

@ -1,119 +1,121 @@
package com.ruoyi.baseinfo.domain; package com.ruoyi.baseinfo.domain;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* BOM base_bom_info * BOM base_bom_info
* *
* @author CaesarBao * @author CaesarBao
* @date 2020-11-04 * @date 2020-11-04
*/ */
@Data @Data
public class BaseBomInfo extends BaseEntity public class BaseBomInfo extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键ID */ /** 主键ID */
private Long bomId; private Long bomId;
/** 父节点ID */ /** 父节点ID */
@Excel(name = "父节点ID") @Excel(name = "父节点ID")
private Long pId; private Long pId;
/** 物料类型ID */ /** 物料类型ID */
@Excel(name = "物料类型ID") @Excel(name = "物料类型ID")
private String materialTypeId; private String materialTypeId;
/** 物料ID */ /** 物料ID */
@Excel(name = "物料ID") @Excel(name = "物料ID")
private String materialId; private String materialId;
/** 状态标志0代表可用 1代表停用 */ /** 状态标志0代表可用 1代表停用 */
@Excel(name = "状态标志", readConverterExp = "0=代表可用,1=代表停用") @Excel(name = "状态标志", readConverterExp = "0=代表可用,1=代表停用")
private String status; private String status;
/** 删除标志0代表存在 1代表删除 */ /** 删除标志0代表存在 1代表删除 */
private String delFlag; private String delFlag;
private String materialTypeName; private String materialTypeName;
private String materialName; private String materialName;
public void setBomId(Long objid) private String materialCode;
{
this.bomId = objid; public void setBomId(Long objid)
} {
this.bomId = objid;
public Long getBomId() }
{
return bomId; public Long getBomId()
} {
public void setpId(Long pId) return bomId;
{ }
this.pId = pId; public void setpId(Long pId)
} {
this.pId = pId;
public Long getpId() }
{
return pId; public Long getpId()
} {
return pId;
public void setMaterialTypeId(String materialTypeId) }
{
this.materialTypeId = materialTypeId; public void setMaterialTypeId(String materialTypeId)
} {
this.materialTypeId = materialTypeId;
public String getMaterialTypeId() }
{
return materialTypeId; public String getMaterialTypeId()
} {
public void setMaterialId(String materialId) return materialTypeId;
{ }
this.materialId = materialId; public void setMaterialId(String materialId)
} {
this.materialId = materialId;
public String getMaterialId() }
{
return materialId; public String getMaterialId()
} {
public void setStatus(String status) return materialId;
{ }
this.status = status; public void setStatus(String status)
} {
this.status = status;
public String getStatus() }
{
return status; public String getStatus()
} {
public void setDelFlag(String delFlag) return status;
{ }
this.delFlag = delFlag; public void setDelFlag(String delFlag)
} {
this.delFlag = delFlag;
public String getDelFlag() }
{
return delFlag; public String getDelFlag()
} {
return delFlag;
@Override }
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @Override
.append("bomId", getBomId()) public String toString() {
.append("pId", getpId()) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("materialTypeId", getMaterialTypeId()) .append("bomId", getBomId())
.append("materialId", getMaterialId()) .append("pId", getpId())
.append("status", getStatus()) .append("materialTypeId", getMaterialTypeId())
.append("remark", getRemark()) .append("materialId", getMaterialId())
.append("createBy", getCreateBy()) .append("status", getStatus())
.append("createTime", getCreateTime()) .append("remark", getRemark())
.append("updateBy", getUpdateBy()) .append("createBy", getCreateBy())
.append("updateTime", getUpdateTime()) .append("createTime", getCreateTime())
.append("delFlag", getDelFlag()) .append("updateBy", getUpdateBy())
.toString(); .append("updateTime", getUpdateTime())
} .append("delFlag", getDelFlag())
} .toString();
}
}

@ -1,5 +1,6 @@
package com.ruoyi.baseinfo.domain; package com.ruoyi.baseinfo.domain;
import com.ruoyi.system.domain.SysDept;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -41,6 +42,8 @@ public class BaseWorkingprocedureInfo extends BaseEntity
private String deptName; private String deptName;
private SysDept dept;
private boolean flag = false; private boolean flag = false;
public void setObjid(Long objid) public void setObjid(Long objid)

@ -1,77 +1,80 @@
package com.ruoyi.baseinfo.mapper; package com.ruoyi.baseinfo.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.baseinfo.domain.BaseBomInfo; import com.ruoyi.baseinfo.domain.BaseBomInfo;
import org.apache.ibatis.annotations.Param;
/**
* BOMMapper /**
* * BOMMapper
* @author CaesarBao *
* @date 2020-11-04 * @author CaesarBao
*/ * @date 2020-11-04
public interface BaseBomInfoMapper */
{ public interface BaseBomInfoMapper
/** {
* BOM /**
* * BOM
* @param objid BOMID *
* @return BOM * @param objid BOMID
*/ * @return BOM
public BaseBomInfo selectBaseBomInfoById(Long objid); */
public BaseBomInfo selectBaseBomInfoById(Long objid);
/**
* BOM /**
* * BOM
* @param baseBomInfo BOM *
* @return BOM * @param baseBomInfo BOM
*/ * @return BOM
public List<BaseBomInfo> selectBaseBomInfoList(BaseBomInfo baseBomInfo); */
public List<BaseBomInfo> selectBaseBomInfoList(BaseBomInfo baseBomInfo);
/**
* BOM /**
* * BOM
* @param baseBomInfo BOM *
* @return * @param baseBomInfo BOM
*/ * @return
public int insertBaseBomInfo(BaseBomInfo baseBomInfo); */
public int insertBaseBomInfo(BaseBomInfo baseBomInfo);
/**
* BOM /**
* * BOM
* @param baseBomInfo BOM *
* @return * @param baseBomInfo BOM
*/ * @return
public int updateBaseBomInfo(BaseBomInfo baseBomInfo); */
public int updateBaseBomInfo(BaseBomInfo baseBomInfo);
/**
* BOM /**
* * BOM
* @param objid BOMID *
* @return * @param objid BOMID
*/ * @return
public int deleteBaseBomInfoById(Long objid); */
public int deleteBaseBomInfoById(Long objid);
/**
* BOM /**
* * BOM
* @param objids ID *
* @return * @param objids ID
*/ * @return
public int deleteBaseBomInfoByIds(String[] objids); */
public int deleteBaseBomInfoByIds(String[] objids);
/**
* BOM /**
* * BOM
* @param materialName BOM *
* @return * @param materialName BOM
*/ * @param materialTypeId
public BaseBomInfo selectBaseBomInfoBymaterialName(BaseBomInfo baseBomInfo); * @param materialId
/** * @return
* BOM */
* public BaseBomInfo selectBaseBomInfoBymaterialName(@Param("materialName") String materialName, @Param("materialTypeId") String materialTypeId,@Param("materialId") String materialId);
* @param parentId ID /**
* @return * BOM
*/ *
public int selectBomCount(BaseBomInfo baseBomInfo); * @param baseBomInfo ID
} * @return
*/
public int selectBomCount(BaseBomInfo baseBomInfo);
}

@ -2,6 +2,7 @@ package com.ruoyi.baseinfo.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.baseinfo.domain.BaseMaterialInfo; import com.ruoyi.baseinfo.domain.BaseMaterialInfo;
import com.ruoyi.common.core.domain.CxSelect;
/** /**
* Mapper * Mapper
@ -58,4 +59,6 @@ public interface BaseMaterialInfoMapper
* @return * @return
*/ */
public int deleteBaseMaterialInfoByIds(String[] objids); public int deleteBaseMaterialInfoByIds(String[] objids);
public List<CxSelect> selectCxSelectChildList(String materialTypeId);
} }

@ -1,7 +1,10 @@
package com.ruoyi.baseinfo.mapper; package com.ruoyi.baseinfo.mapper;
import java.util.List; import java.util.List;
import java.util.Map;
import com.ruoyi.baseinfo.domain.BaseMaterialtypeInfo; import com.ruoyi.baseinfo.domain.BaseMaterialtypeInfo;
import com.ruoyi.common.core.domain.CxSelect;
/** /**
* Mapper * Mapper
@ -61,4 +64,6 @@ public interface BaseMaterialtypeInfoMapper
public List<BaseMaterialtypeInfo> selectAddBaseMaterialtypeInfoList(); public List<BaseMaterialtypeInfo> selectAddBaseMaterialtypeInfoList();
public List<CxSelect> selectCxSelectList();
} }

@ -2,6 +2,7 @@ package com.ruoyi.baseinfo.service;
import java.util.List; import java.util.List;
import com.ruoyi.baseinfo.domain.BaseMaterialtypeInfo; import com.ruoyi.baseinfo.domain.BaseMaterialtypeInfo;
import com.ruoyi.common.core.domain.CxSelect;
/** /**
* Service * Service
@ -63,4 +64,6 @@ public interface IBaseMaterialtypeInfoService
public List<BaseMaterialtypeInfo> selectEditBaseMaterialtypeInfoList(String materialTypeId); public List<BaseMaterialtypeInfo> selectEditBaseMaterialtypeInfoList(String materialTypeId);
public List<CxSelect> selectCxSelectList();
} }

@ -1,110 +1,112 @@
package com.ruoyi.baseinfo.service.impl; package com.ruoyi.baseinfo.service.impl;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.SysDept;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.baseinfo.mapper.BaseBomInfoMapper; import com.ruoyi.baseinfo.mapper.BaseBomInfoMapper;
import com.ruoyi.baseinfo.domain.BaseBomInfo; import com.ruoyi.baseinfo.domain.BaseBomInfo;
import com.ruoyi.baseinfo.service.IBaseBomInfoService; import com.ruoyi.baseinfo.service.IBaseBomInfoService;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
/** /**
* BOMService * BOMService
* *
* @author CaesarBao * @author CaesarBao
* @date 2020-11-04 * @date 2020-11-04
*/ */
@Service @Service
public class BaseBomInfoServiceImpl implements IBaseBomInfoService public class BaseBomInfoServiceImpl implements IBaseBomInfoService
{ {
@Autowired @Autowired
private BaseBomInfoMapper baseBomInfoMapper; private BaseBomInfoMapper baseBomInfoMapper;
/** /**
* BOM * BOM
* *
* @param objid BOMID * @param objid BOMID
* @return BOM * @return BOM
*/ */
@Override @Override
public BaseBomInfo selectBaseBomInfoById(Long objid) public BaseBomInfo selectBaseBomInfoById(Long objid)
{ {
return baseBomInfoMapper.selectBaseBomInfoById(objid); return baseBomInfoMapper.selectBaseBomInfoById(objid);
} }
/** /**
* BOM * BOM
* *
* @param baseBomInfo BOM * @param baseBomInfo BOM
* @return BOM * @return BOM
*/ */
@Override @Override
public List<BaseBomInfo> selectBaseBomInfoList(BaseBomInfo baseBomInfo) public List<BaseBomInfo> selectBaseBomInfoList(BaseBomInfo baseBomInfo)
{ {
return baseBomInfoMapper.selectBaseBomInfoList(baseBomInfo); return baseBomInfoMapper.selectBaseBomInfoList(baseBomInfo);
} }
/** /**
* BOM * BOM
* *
* @param baseBomInfo BOM * @param baseBomInfo BOM
* @return * @return
*/ */
@Override @Override
public int insertBaseBomInfo(BaseBomInfo baseBomInfo) public int insertBaseBomInfo(BaseBomInfo baseBomInfo)
{ {
baseBomInfo.setCreateTime(DateUtils.getNowDate()); baseBomInfo.setCreateTime(DateUtils.getNowDate());
return baseBomInfoMapper.insertBaseBomInfo(baseBomInfo); return baseBomInfoMapper.insertBaseBomInfo(baseBomInfo);
} }
/** /**
* BOM * BOM
* *
* @param baseBomInfo BOM * @param baseBomInfo BOM
* @return * @return
*/ */
@Override @Override
public int updateBaseBomInfo(BaseBomInfo baseBomInfo) public int updateBaseBomInfo(BaseBomInfo baseBomInfo)
{ {
baseBomInfo.setUpdateTime(DateUtils.getNowDate()); baseBomInfo.setUpdateTime(DateUtils.getNowDate());
return baseBomInfoMapper.updateBaseBomInfo(baseBomInfo); return baseBomInfoMapper.updateBaseBomInfo(baseBomInfo);
} }
/** /**
* BOM * BOM
* *
* @param ids ID * @param ids ID
* @return * @return
*/ */
@Override @Override
public int deleteBaseBomInfoByIds(String ids) public int deleteBaseBomInfoByIds(String ids)
{ {
return baseBomInfoMapper.deleteBaseBomInfoByIds(Convert.toStrArray(ids)); return baseBomInfoMapper.deleteBaseBomInfoByIds(Convert.toStrArray(ids));
} }
/** /**
* BOM * BOM
* *
* @param objid BOMID * @param objid BOMID
* @return * @return
*/ */
@Override @Override
public int deleteBaseBomInfoById(Long objid) public int deleteBaseBomInfoById(Long objid)
{ {
return baseBomInfoMapper.deleteBaseBomInfoById(objid); return baseBomInfoMapper.deleteBaseBomInfoById(objid);
} }
@Override @Override
public BaseBomInfo selectBaseBomInfoBymaterialName(BaseBomInfo baseBomInfo) { public BaseBomInfo selectBaseBomInfoBymaterialName(BaseBomInfo baseBomInfo) {
return baseBomInfoMapper.selectBaseBomInfoBymaterialName(baseBomInfo); BaseBomInfo baseBomInfolist = new BaseBomInfo();
} baseBomInfolist = baseBomInfoMapper.selectBaseBomInfoBymaterialName(baseBomInfo.getMaterialName(),baseBomInfo.getMaterialTypeId(),baseBomInfo.getMaterialId());
return baseBomInfolist;
@Override }
public int selectBomCount(Long parentId) {
BaseBomInfo baseBomInfo = new BaseBomInfo(); @Override
baseBomInfo.setpId(parentId); public int selectBomCount(Long parentId) {
return baseBomInfoMapper.selectBomCount(baseBomInfo); BaseBomInfo baseBomInfo = new BaseBomInfo();
} baseBomInfo.setpId(parentId);
} return baseBomInfoMapper.selectBomCount(baseBomInfo);
}
}

@ -1,6 +1,10 @@
package com.ruoyi.baseinfo.service.impl; package com.ruoyi.baseinfo.service.impl;
import java.util.List; import java.util.List;
import java.util.Map;
import com.ruoyi.baseinfo.mapper.BaseMaterialInfoMapper;
import com.ruoyi.common.core.domain.CxSelect;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -20,6 +24,8 @@ public class BaseMaterialtypeInfoServiceImpl implements IBaseMaterialtypeInfoSer
{ {
@Autowired @Autowired
private BaseMaterialtypeInfoMapper baseMaterialtypeInfoMapper; private BaseMaterialtypeInfoMapper baseMaterialtypeInfoMapper;
@Autowired
private BaseMaterialInfoMapper baseMaterialInfoMapper;
/** /**
* *
@ -114,4 +120,14 @@ public class BaseMaterialtypeInfoServiceImpl implements IBaseMaterialtypeInfoSer
} }
return cbEditMaterialtypeInfoList; return cbEditMaterialtypeInfoList;
} }
@Override
public List<CxSelect> selectCxSelectList() {
List<CxSelect> CxSelectList = baseMaterialtypeInfoMapper.selectCxSelectList();
for (CxSelect a:CxSelectList
) {
a.setS(baseMaterialInfoMapper.selectCxSelectChildList(a.getV()));
}
return CxSelectList;
}
} }

@ -1,124 +1,122 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.baseinfo.mapper.BaseBomInfoMapper"> <mapper namespace="com.ruoyi.baseinfo.mapper.BaseBomInfoMapper">
<resultMap type="BaseBomInfo" id="BaseBomInfoResult"> <resultMap type="BaseBomInfo" id="BaseBomInfoResult">
<result property="bomId" column="bom_id" /> <result property="bomId" column="bom_id" />
<result property="pId" column="p_id" /> <result property="pId" column="p_id" />
<result property="materialTypeId" column="material_type_id" /> <result property="materialTypeId" column="material_type_id" />
<result property="materialId" column="material_id" /> <result property="materialId" column="material_id" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="materialTypeName" column="material_type_name" /> <result property="materialTypeName" column="material_type_name" />
<result property="materialName" column="material_name" /> <result property="materialName" column="material_name" />
</resultMap> <result property="materialCode" column="material_code" />
</resultMap>
<sql id="selectBaseBomInfoVo">
select bom_id, p_id, material_type_id, material_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_bom_info <sql id="selectBaseBomInfoVo">
</sql> select bom_id, p_id, material_type_id, material_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_bom_info
</sql>
<select id="selectBaseBomInfoList" parameterType="BaseBomInfo" resultMap="BaseBomInfoResult">
select t1.bom_id, t1.p_id, t1.material_type_id,t2.material_type_name, t1.material_id,t3.material_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_bom_info t1 <select id="selectBaseBomInfoList" parameterType="BaseBomInfo" resultMap="BaseBomInfoResult">
left join dbo.base_materialtype_info t2 on t1.material_type_id = t2.material_type_id select t1.bom_id, t1.p_id, t3.material_code, t1.material_type_id,t2.material_type_name, t1.material_id,t3.material_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_bom_info t1
left join dbo.base_material_info t3 on t1.material_id = t3.material_id left join dbo.base_materialtype_info t2 on t1.material_type_id = t2.material_type_id
<where> left join dbo.base_material_info t3 on t1.material_id = t3.material_id
<if test="pId != null and pId != ''"> and p_id = #{pId}</if> <where>
<if test="materialTypeId != null and materialTypeId != ''"> and material_type_id = #{materialTypeId}</if> <if test="pId != null and pId != ''"> and p_id = #{pId}</if>
<if test="materialId != null and materialId != ''"> and material_id = #{materialId}</if> <if test="materialTypeName != null and materialTypeName != ''"> and t2.material_type_name = #{materialTypeName}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="materialName != null and materialName != ''"> and t3.material_name = #{materialName}</if>
</where> <if test="materialCode != null and materialCode != ''"> and t3.material_code = #{materialCode}</if>
</select> <if test="materialTypeId != null and materialTypeId != ''"> and t1.material_type_id = #{materialTypeId}</if>
<if test="materialId != null and materialId != ''"> and t1.material_id = #{materialId}</if>
<select id="selectBaseBomInfoById" parameterType="Long" resultMap="BaseBomInfoResult"> <if test="status != null and status != ''"> and t1.status = #{status}</if>
select t1.bom_id, t1.p_id, t1.material_type_id,t2.material_type_name, t1.material_id,t3.material_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_bom_info t1 </where>
left join dbo.base_materialtype_info t2 on t1.material_type_id = t2.material_type_id </select>
left join dbo.base_material_info t3 on t1.material_id = t3.material_id
where t1.bom_id = #{bomId} <select id="selectBaseBomInfoById" parameterType="Long" resultMap="BaseBomInfoResult">
</select> select t1.bom_id, t1.p_id, t1.material_type_id,t2.material_type_name, t1.material_id,t3.material_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_bom_info t1
left join dbo.base_materialtype_info t2 on t1.material_type_id = t2.material_type_id
<insert id="insertBaseBomInfo" parameterType="BaseBomInfo"> left join dbo.base_material_info t3 on t1.material_id = t3.material_id
insert into base_bom_info where t1.bom_id = #{bomId}
<trim prefix="(" suffix=")" suffixOverrides=","> </select>
<if test="bomId != null">bom_id,</if>
<if test="pId != null">p_id,</if> <insert id="insertBaseBomInfo" parameterType="BaseBomInfo">
<if test="materialTypeId != null">material_type_id,</if> insert into base_bom_info
<if test="materialId != null">material_id,</if> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="status != null">status,</if> <if test="bomId != null">bom_id,</if>
<if test="remark != null">remark,</if> <if test="pId != null">p_id,</if>
<if test="createBy != null">create_by,</if> <if test="materialTypeId != null">material_type_id,</if>
<if test="createTime != null">create_time,</if> <if test="materialId != null">material_id,</if>
<if test="updateBy != null">update_by,</if> <if test="status != null">status,</if>
<if test="updateTime != null">update_time,</if> <if test="remark != null">remark,</if>
<if test="delFlag != null">del_flag,</if> <if test="createBy != null">create_by,</if>
</trim> <if test="createTime != null">create_time,</if>
<trim prefix="values (" suffix=")" suffixOverrides=","> <if test="updateBy != null">update_by,</if>
<if test="bomId != null">#{bom_id},</if> <if test="updateTime != null">update_time,</if>
<if test="pId != null">#{pId},</if> <if test="delFlag != null">del_flag,</if>
<if test="materialTypeId != null">#{materialTypeId},</if> </trim>
<if test="materialId != null">#{materialId},</if> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="status != null">#{status},</if> <if test="bomId != null">#{bom_id},</if>
<if test="remark != null">#{remark},</if> <if test="pId != null">#{pId},</if>
<if test="createBy != null">#{createBy},</if> <if test="materialTypeId != null">#{materialTypeId},</if>
<if test="createTime != null">#{createTime},</if> <if test="materialId != null">#{materialId},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="status != null">#{status},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="remark != null">#{remark},</if>
<if test="delFlag != null">#{delFlag},</if> <if test="createBy != null">#{createBy},</if>
</trim> <if test="createTime != null">#{createTime},</if>
</insert> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<update id="updateBaseBomInfo" parameterType="BaseBomInfo"> <if test="delFlag != null">#{delFlag},</if>
update base_bom_info </trim>
<trim prefix="SET" suffixOverrides=","> </insert>
<if test="pId != null">p_id = #{pId},</if>
<if test="materialTypeId != null">material_type_id = #{materialTypeId},</if> <update id="updateBaseBomInfo" parameterType="BaseBomInfo">
<if test="materialId != null">material_id = #{materialId},</if> update base_bom_info
<if test="status != null">status = #{status},</if> <trim prefix="SET" suffixOverrides=",">
<if test="remark != null">remark = #{remark},</if> <if test="pId != null">p_id = #{pId},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="materialTypeId != null">material_type_id = #{materialTypeId},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="materialId != null">material_id = #{materialId},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="status != null">status = #{status},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="remark != null">remark = #{remark},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if> <if test="createBy != null">create_by = #{createBy},</if>
</trim> <if test="createTime != null">create_time = #{createTime},</if>
where bom_id = #{bomId} <if test="updateBy != null">update_by = #{updateBy},</if>
</update> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<delete id="deleteBaseBomInfoById" parameterType="Long"> </trim>
delete from base_bom_info where bom_id = #{bomId} where bom_id = #{bomId}
</delete> </update>
<delete id="deleteBaseBomInfoByIds" parameterType="String"> <delete id="deleteBaseBomInfoById" parameterType="Long">
delete from base_bom_info where bom_id in delete from base_bom_info where bom_id = #{bomId}
<foreach item="bomId" collection="array" open="(" separator="," close=")"> </delete>
#{bomId}
</foreach> <delete id="deleteBaseBomInfoByIds" parameterType="String">
</delete> delete from base_bom_info where bom_id in
<foreach item="bomId" collection="array" open="(" separator="," close=")">
#{bomId}
<select id="selectBaseBomInfoBymaterialName" parameterType="BaseBomInfo" resultMap="BaseBomInfoResult"> </foreach>
select t1.bom_id, t1.p_id, t1.material_type_id,t2.material_type_name, t1.material_id,t3.material_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_bom_info t1 </delete>
left join dbo.base_materialtype_info t2 on t1.material_type_id = t2.material_type_id
left join dbo.base_material_info t3 on t1.material_id = t3.material_id
<where> <select id="selectBaseBomInfoBymaterialName" parameterType="BaseBomInfo" resultMap="BaseBomInfoResult">
<if test="pId != null and pId != ''"> and t1.p_id = #{pId}</if> select t1.bom_id, t1.p_id, t1.material_type_id,t2.material_type_name, t1.material_id,t3.material_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_bom_info t1
<if test="materialName != null and materialName != ''"> and t3.material_name = #{materialName}</if> left join dbo.base_materialtype_info t2 on t1.material_type_id = t2.material_type_id
<if test="materialTypeId != null and materialTypeId != ''"> and t1.material_type_id = #{materialTypeId}</if> left join dbo.base_material_info t3 on t1.material_id = t3.material_id
<if test="materialId != null and materialId != ''"> and t1.material_id = #{materialId}</if> where t3.material_name = #{materialName} and t1.material_type_id = #{materialTypeId} and t1.material_id = #{materialId}
<if test="status != null and status != ''"> and t1.status = #{status}</if> </select>
</where> <select id="selectBomCount" parameterType="BaseBomInfo" resultType="int">
</select> select count(1) from base_bom_info
<select id="selectBomCount" parameterType="BaseBomInfo" resultType="int"> where del_flag = '0'
select count(1) from base_bom_info <if test="bomId != null and bomId != 0"> and bom_id = #{bomId} </if>
where del_flag = '0' <if test="pId != null and pId != 0"> and p_id = #{pId} </if>
<if test="bomId != null and bomId != 0"> and bom_id = #{bomId} </if> </select>
<if test="pId != null and pId != 0"> and p_id = #{pId} </if>
</select> </mapper>
</mapper>

@ -102,4 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</delete> </delete>
<select id="selectCxSelectChildList" parameterType="String" resultType="com.ruoyi.common.core.domain.CxSelect">
select material_id as v, material_name as n, material_type_id from base_material_info
where status = 0
and material_type_id = #{materialTypeId}
</select>
</mapper> </mapper>

@ -99,4 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectAddBaseMaterialtypeInfoList" parameterType="BaseMaterialtypeInfo" resultMap="BaseMaterialtypeInfoResult"> <select id="selectAddBaseMaterialtypeInfoList" parameterType="BaseMaterialtypeInfo" resultMap="BaseMaterialtypeInfoResult">
select t1.objid, t1.material_type_id, t1.material_type_name, t1.working_procedure_id,t2.working_procedure_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_materialtype_info t1 left join base_workingprocedure_info t2 on t1.working_procedure_id = t2.working_procedure_id select t1.objid, t1.material_type_id, t1.material_type_name, t1.working_procedure_id,t2.working_procedure_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_materialtype_info t1 left join base_workingprocedure_info t2 on t1.working_procedure_id = t2.working_procedure_id
</select> </select>
<select id="selectCxSelectList" parameterType="BaseMaterialtypeInfo" resultType="com.ruoyi.common.core.domain.CxSelect">
select t1.material_type_id as v, t1.material_type_name as n from base_materialtype_info t1 left join base_workingprocedure_info t2 on t1.working_procedure_id = t2.working_procedure_id
where t1.status = 0
</select>
</mapper> </mapper>

@ -17,8 +17,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name" />
<association property="dept" column="devicedepartment" javaType="SysDept" resultMap="deptResult"/>
</resultMap>
<resultMap id="deptResult" type="SysDept">
<id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id"/>
<result property="deptName" column="dept_name"/>
<result property="orderNum" column="order_num"/>
<result property="leader" column="leader"/>
<result property="status" column="dept_status"/>
</resultMap> </resultMap>
<sql id="selectBaseWorkingprocedureInfoVo"> <sql id="selectBaseWorkingprocedureInfoVo">
select objid, working_procedure_id, working_procedure_name, dept_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_workingprocedure_info select objid, working_procedure_id, working_procedure_name, dept_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_workingprocedure_info
</sql> </sql>
@ -34,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectBaseWorkingprocedureInfoById" parameterType="Long" resultMap="BaseWorkingprocedureInfoResult"> <select id="selectBaseWorkingprocedureInfoById" parameterType="Long" resultMap="BaseWorkingprocedureInfoResult">
<include refid="selectBaseWorkingprocedureInfoVo"/> select t1.objid, t1.working_procedure_id, t1.working_procedure_name, t1.dept_id,t2.dept_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_workingprocedure_info t1 left join sys_dept t2 on t1.dept_id = t2.dept_id
where objid = #{objid} where objid = #{objid}
</select> </select>

Loading…
Cancel
Save