修改登陆界面

master
Admin 5 years ago
parent 7e7974efb7
commit 4747d1bf3d

@ -1,10 +1,12 @@
package com.ruoyi.web.controller.baseinfo; package com.ruoyi.web.controller.baseinfo;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.ruoyi.baseinfo.domain.BaseMaterialInfo; import com.ruoyi.baseinfo.domain.BaseMaterialInfo;
import com.ruoyi.baseinfo.service.IBaseMaterialInfoService; import com.ruoyi.baseinfo.service.IBaseMaterialInfoService;
import com.ruoyi.baseinfo.service.IBaseMaterialtypeInfoService; import com.ruoyi.baseinfo.service.IBaseMaterialtypeInfoService;
import com.ruoyi.common.core.domain.CxSelect;
import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.SysDept;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -92,6 +94,7 @@ public class BaseBomInfoController extends BaseController
public String add(ModelMap mmap) public String add(ModelMap mmap)
{ {
BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo(); BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo();
mmap.put("data",baseMaterialtypeInfoService.selectCxSelectList());
mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList()); mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList());
mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo)); mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo));
return prefix + "/addproduct"; return prefix + "/addproduct";
@ -115,6 +118,7 @@ public class BaseBomInfoController extends BaseController
public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
{ {
BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo(); BaseMaterialInfo BaseMaterialInfo = new BaseMaterialInfo();
mmap.put("data",baseMaterialtypeInfoService.selectCxSelectList());
mmap.put("parent", baseBomInfoService.selectBaseBomInfoById(parentId)); mmap.put("parent", baseBomInfoService.selectBaseBomInfoById(parentId));
mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList()); mmap.put("cbmaterialtypeInfo",baseMaterialtypeInfoService.selectAddBaseMaterialtypeInfoList());
mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo)); mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(BaseMaterialInfo));
@ -129,9 +133,9 @@ public class BaseBomInfoController extends BaseController
@ResponseBody @ResponseBody
public AjaxResult addSave(BaseBomInfo baseBomInfo) public AjaxResult addSave(BaseBomInfo baseBomInfo)
{ {
BaseBomInfo pbaseBomInfo = new BaseBomInfo(); // BaseBomInfo pbaseBomInfo = new BaseBomInfo();
pbaseBomInfo = baseBomInfoService.selectBaseBomInfoBymaterialName(baseBomInfo); // pbaseBomInfo = baseBomInfoService.selectBaseBomInfoById(baseBomInfo.getBomId());
baseBomInfo.setpId(pbaseBomInfo.getBomId()); // baseBomInfo.setpId(pbaseBomInfo.getBomId());
return toAjax(baseBomInfoService.insertBaseBomInfo(baseBomInfo)); return toAjax(baseBomInfoService.insertBaseBomInfo(baseBomInfo));
} }

@ -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,13 +1,13 @@
# 项目相关配置 # 项目相关配置
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

@ -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
}

@ -8,6 +8,7 @@
<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">
<input id="pId" name="pId" type="hidden" th:value="${parent.bomId}" />
<!-- <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">-->
@ -22,24 +23,28 @@
</div> </div>
</div> </div>
</div> </div>
<div id="element" class="row">
<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">
<select name="materialTypeId" id="workingProcedureId" class="form-control "> <select name="materialTypeId" class="type form-control m-b" data-first-title="请选择">
<option value="">--请选择物料类型名称--</option> <option value="">--请选择物料类型--</option>
<option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}"></option> <option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}">
</option>
</select> </select>
</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">
<select name="materialId" id="materialId" class="form-control "> <select name="materialId" class="router form-control m-b" data-first-title="请选择">
<option value="">--请选择物料名称--</option> <option value="">--请选择物料名称--</option>
<option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}"></option> <option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}">
</option>
</select> </select>
</div> </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">
@ -51,7 +56,17 @@
<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 :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" /> <th:block th:include="include :: select2-js" />
<th:block th:include="include :: jquery-cxselect-js" />
<script th:inline="javascript"> <script th:inline="javascript">
// 直接返回获取
var data = [[${data}]];
console.log(data);
$('#element').cxSelect({
selects: ['type', 'router'],
jsonValue: 'v',
data: data
});
var prefix = ctx + "baseinfo/bominfo" var prefix = ctx + "baseinfo/bominfo"
$("#form-bominfo-add").validate({ $("#form-bominfo-add").validate({
focusCleanup: true focusCleanup: true

@ -22,28 +22,54 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div id="element" class="row">
<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">
<select name="materialTypeId" id="workingProcedureId" class="form-control "> <select name="materialTypeId" class="type form-control m-b" data-first-title="请选择">
<option value="">--请选择物料类型--</option> <option value="">--请选择物料类型--</option>
<option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}"></option> <option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}">
</option>
</select> </select>
</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">
<select name="materialId" id="materialId" class="form-control "> <select name="materialId" class="router form-control m-b" data-first-title="请选择">
<option value="">--请选择物料类型--</option> <option value="">--请选择物料名称--</option>
<option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}"></option> <option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}">
</option>
</select> </select>
</div> </div>
</div> </div>
</div>
<!-- <div class="form-group">-->
<!-- <div id="element1" class="row">-->
<!-- <label class="col-sm-3 control-label">物料类型:</label>-->
<!-- <div class="col-sm-8" >-->
<!-- <select name="materialTypeId" id="materialTypeId" class="form-control ">-->
<!-- <option value="">&#45;&#45;请选择物料类型&#45;&#45;</option>-->
<!-- <option name="cbmaterialtypeInfo" th:each="materialTypeId:${cbmaterialtypeInfo}" th:value="${materialTypeId.materialTypeId}" th:text="${materialTypeId.materialTypeName}" th:disabled="${materialTypeId.status == '1'}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <label class="col-sm-3 control-label">物料名称:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="materialId" id="materialId" class="form-control ">-->
<!-- <option value="">&#45;&#45;请选择物料名称&#45;&#45;</option>-->
<!-- <option name="cbmaterialInfo" th:each="materialId:${cbmaterialInfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group"> -->
<!-- </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">
<input name="remark" class="form-control" type="text"> <input name="remark" class="router form-control m-b" type="text">
</div> </div>
</div> </div>
</form> </form>
@ -51,7 +77,17 @@
<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 :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" /> <th:block th:include="include :: select2-js" />
<th:block th:include="include :: jquery-cxselect-js" />
<script th:inline="javascript"> <script th:inline="javascript">
// 直接返回获取
var data = [[${data}]];
console.log(data);
$('#element').cxSelect({
selects: ['type', 'router'],
jsonValue: 'v',
data: data
});
var prefix = ctx + "baseinfo/bominfo" var prefix = ctx + "baseinfo/bominfo"
$("#form-bominfo-add").validate({ $("#form-bominfo-add").validate({
focusCleanup: true focusCleanup: true

@ -10,21 +10,20 @@
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<!-- <li>-->
<!-- <label>父节点ID</label>-->
<!-- <input type="text" name="pId"/>-->
<!-- </li>-->
<li> <li>
<label>物料类型:</label> <label>物料类型:</label>
<select name="materialTypeId"> <input type="text" name="materialTypeName"/>
<option value="">所有</option>
</select>
</li> </li>
<li> <li>
<label>物料ID</label> <label>物料名称:</label>
<select name="materialId"> <input type="text" name="materialName"/>
<option value="">所有</option> <!-- <select name="materialName">-->
</select> <!-- <option value="">所有</option>-->
<!-- </select>-->
</li>
<li>
<label></label>
<input type="text" name="materialCode"/>
</li> </li>
<li> <li>
<label>状态标志:</label> <label>状态标志:</label>
@ -34,7 +33,7 @@
</select> </select>
</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="$.treeTable.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>
@ -84,7 +83,7 @@
modalName: "BOM", modalName: "BOM",
columns: [{ columns: [{
field: 'selectItem', field: 'selectItem',
radio: true radio: false
}, },
{ {
field: 'materialTypeName', field: 'materialTypeName',
@ -96,6 +95,11 @@
title: '物料名称', title: '物料名称',
align: "left" align: "left"
}, },
{
field: 'materialCode',
title: '规格型号',
align: "left"
},
{ {
field: 'status', field: 'status',
title: '状态标志', title: '状态标志',

@ -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>

@ -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">
@ -61,6 +62,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/deviceinfo"; var prefix = ctx + "baseinfo/deviceinfo";
$("#form-deviceinfo-edit").validate({ $("#form-deviceinfo-edit").validate({

@ -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

@ -47,7 +47,7 @@
<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>
@ -68,6 +68,10 @@
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "设备产量日报", modalName: "设备产量日报",
showFooter: true, showFooter: true,
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
columns: [{ columns: [{
checkbox: true checkbox: true
}, },

@ -47,7 +47,7 @@
<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>

@ -47,7 +47,7 @@
<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>

@ -51,7 +51,7 @@
<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>

@ -47,7 +47,7 @@
<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>

@ -47,7 +47,7 @@
<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>

@ -44,6 +44,8 @@ public class BaseBomInfo extends BaseEntity
private String materialName; private String materialName;
private String materialCode;
public void setBomId(Long objid) public void setBomId(Long objid)
{ {
this.bomId = objid; this.bomId = objid;

@ -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)

@ -2,6 +2,7 @@ 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
@ -64,13 +65,15 @@ public interface BaseBomInfoMapper
* BOM * BOM
* *
* @param materialName BOM * @param materialName BOM
* @param materialTypeId
* @param materialId
* @return * @return
*/ */
public BaseBomInfo selectBaseBomInfoBymaterialName(BaseBomInfo baseBomInfo); public BaseBomInfo selectBaseBomInfoBymaterialName(@Param("materialName") String materialName, @Param("materialTypeId") String materialTypeId,@Param("materialId") String materialId);
/** /**
* BOM * BOM
* *
* @param parentId ID * @param baseBomInfo ID
* @return * @return
*/ */
public int selectBomCount(BaseBomInfo baseBomInfo); 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();
} }

@ -98,7 +98,9 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService
@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 @Override

@ -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;
}
} }

@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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" />
<result property="materialCode" column="material_code" />
</resultMap> </resultMap>
<sql id="selectBaseBomInfoVo"> <sql id="selectBaseBomInfoVo">
@ -25,14 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="selectBaseBomInfoList" parameterType="BaseBomInfo" resultMap="BaseBomInfoResult"> <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 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_materialtype_info t2 on t1.material_type_id = t2.material_type_id 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 left join dbo.base_material_info t3 on t1.material_id = t3.material_id
<where> <where>
<if test="pId != null and pId != ''"> and p_id = #{pId}</if> <if test="pId != null and pId != ''"> and p_id = #{pId}</if>
<if test="materialTypeId != null and materialTypeId != ''"> and material_type_id = #{materialTypeId}</if> <if test="materialTypeName != null and materialTypeName != ''"> and t2.material_type_name = #{materialTypeName}</if>
<if test="materialId != null and materialId != ''"> and material_id = #{materialId}</if> <if test="materialName != null and materialName != ''"> and t3.material_name = #{materialName}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="materialCode != null and materialCode != ''"> and t3.material_code = #{materialCode}</if>
<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>
<if test="status != null and status != ''"> and t1.status = #{status}</if>
</where> </where>
</select> </select>
@ -106,13 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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 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 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 left join dbo.base_material_info t3 on t1.material_id = t3.material_id
<where> where t3.material_name = #{materialName} and t1.material_type_id = #{materialTypeId} and t1.material_id = #{materialId}
<if test="pId != null and pId != ''"> and t1.p_id = #{pId}</if>
<if test="materialName != null and materialName != ''"> and t3.material_name = #{materialName}</if>
<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>
<if test="status != null and status != ''"> and t1.status = #{status}</if>
</where>
</select> </select>
<select id="selectBomCount" parameterType="BaseBomInfo" resultType="int"> <select id="selectBomCount" parameterType="BaseBomInfo" resultType="int">
select count(1) from base_bom_info select count(1) from base_bom_info

@ -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