bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
dingjie 2023-12-23 23:09:27 +08:00
parent 5a49a44693 0ad1ac019d
commit 86c6b25f5d
14 changed files with 93 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java
View File

@ -78,7 +78,7 @@ public class BmUnitPersonController extends BaseController{
@PostMapping
public AjaxResult unitPersonAdd(@Validated @RequestBody BmUnitPerson bmUnitPerson)
{
return toAjax(bmUnitPersonService.unitPersonAdd(bmUnitPerson));
return bmUnitPersonService.unitPersonAdd(bmUnitPerson);
}
/**

28
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java
View File

@ -2,7 +2,9 @@ package com.bonus.sgzb.base.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class BmUnitPerson {
/**类型ID*/
@ApiModelProperty(value = "类型ID")
@ -15,30 +17,4 @@ public class BmUnitPerson {
private String companyId;
public long getUnitId() {
return unitId;
}
public void setUnitId(long unitId) {
this.unitId = unitId;
}
public long getUserId() {
return userId;
}
public void setUserId(long userId) {
this.userId = userId;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
}

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java
View File

@ -11,8 +11,13 @@ public interface BmUnitPersonMapper {
public List<BmUnitPerson> getUnitPerson(BmUnitPerson bmUnitPerson);
BmUnitPerson getUnitPersons(long unitId);
public int unitPersonAdd(BmUnitPerson bmUnitPerson);
public int getUnitPersonUser(BmUnitPerson bmUnitPerson);
public void remove(Long[] unitIds);
public int updateBmUnitPerson(BmUnitPerson bmUnitPerson);

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java
View File

@ -2,6 +2,7 @@ package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.domain.BmUnitPerson;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import java.util.List;
@ -10,7 +11,7 @@ public interface BmUnitPersonService {
public List<BmUnitPerson> getUnitPerson(BmUnitPerson bmUnitPerson);
public int unitPersonAdd(BmUnitPerson bmUnitPerson);
public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson);
public void remove(Long[] unitIds);

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java
View File

@ -4,6 +4,7 @@ package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.BmUnitPerson;
import com.bonus.sgzb.base.mapper.BmUnitPersonMapper;
import com.bonus.sgzb.base.service.BmUnitPersonService;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -27,8 +28,12 @@ public class BmUnitPersonServiceImpl implements BmUnitPersonService {
}
@Override
public int unitPersonAdd(BmUnitPerson bmUnitPerson) {
return bmUnitPersonMapper.unitPersonAdd(bmUnitPerson);
public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson) {
BmUnitPerson ben =bmUnitPersonMapper.getUnitPersons(bmUnitPerson.getUnitId());
if(ben != null){
return AjaxResult.error("保存失败！！！单位已绑定");
}
return AjaxResult.success(bmUnitPersonMapper.unitPersonAdd(bmUnitPerson));
}
@Override

7
sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml
View File

@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select unit_id, user_id, company_id
from bm_unit_person
</sql>
<select id="getUnitPersonAll" resultMap="BmUnitPersonResult">
<!--<include refid="bmUnitInfo"/>-->
@ -36,8 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<select id="getUnitPersons" parameterType="Long" resultMap="BmUnitPersonResult">
<include refid="bmUnitPerson"/>
where unit_id = #{unitId}
</select>
<insert id="unitPersonAdd" parameterType="com.bonus.sgzb.base.domain.BmUnitPerson">
insert into bm_unit_person (

111
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
UPDATE tm_task tt
LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW()
WHERE
bai.id = #{id}
</update>
@ -396,94 +396,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getView" resultType="com.bonus.sgzb.material.domain.BackApplyInfo">
SELECT
result1.*,
result2.num AS useNum
bai.back_person AS backPerson,
bai.phone AS phone,
bai.back_time as backTime,
lot.lot_name AS lotName,
unit.unit_name AS unitName,
mt.type_name typeCode,
mt2.type_name AS typeName,
bagi.agreement_code as agreementCode,
bad.pre_num AS num
FROM
(
-- 结果1的原始查询
SELECT
bad.id as detailsId,
bpl.lot_name as lotName,
bui.unit_name as unitName,
bagi.agreement_code as agreementCode,
bai.back_person as backPerson,
bai.phone,
bai.back_time as backTime,
bai.`code`,
bai.remark,
us.user_name as createName,
us2.user_name as examineName,
bad.type_id as typeId,
mt.type_name typeCode,
CONCAT_WS(
'/',
IFNULL( mt3.type_name, '' )) AS typeName,
bad.pre_num AS num,
mm.ma_code AS maCode
FROM
back_apply_details bad
LEFT JOIN back_apply_info bai ON bai.id = bad.parent_id
LEFT JOIN ma_type mt ON mt.type_id = bad.type_id
LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
LEFT JOIN ma_machine mm ON mm.type_id = bad.type_id
LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id
LEFT JOIN bm_agreement_info bagi ON bagi.agreement_id = tta.agreement_id
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bagi.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bagi.unit_id
LEFT JOIN sys_user us on us.user_id=bai.create_by
LEFT JOIN sys_user us2 on us2.user_id=bai.direct_audit_by
WHERE
bai.id = #{id}
<if test="keyWord != null and keyWord != ''">
and mt.type_name like concat('%', #{keyWord}, '%') or
mt3.type_name like concat('%', #{keyWord}, '%') or
mm.ma_code like concat('%', #{keyWord}, '%')
</if>
) AS result1
LEFT JOIN
(
-- 结果2的原始查询，作为子查询
SELECT
subquery1.type_id AS typeId,
subquery1.typeName typeCode,
subquery1.out_num - COALESCE ( subquery2.audit_num, 0 ) AS num
FROM
(-- 第一个查询作为子查询
SELECT
mt.type_id,
mt.type_name AS typeName,
lod.out_num
FROM
tm_task_agreement tta
LEFT JOIN lease_apply_info lai ON lai.task_id = tta.task_id
LEFT JOIN lease_out_details lod ON lod.parent_id = lai.id
LEFT JOIN ma_type mt ON mt.type_id = lod.type_id
LEFT JOIN tm_task tt ON tt.task_id = tta.task_id
WHERE
tta.agreement_id = #{agreementId}
AND tt.task_type = '29'
and mt.type_id is not null
) AS subquery1
LEFT JOIN (-- 第二个查询作为子查询
SELECT
mt.type_id,
mt.type_name,
bad.audit_num
FROM
tm_task tt
LEFT JOIN tm_task_agreement tta ON tta.task_id = tt.task_id
LEFT JOIN back_apply_info bai ON bai.task_id = tta.task_id
LEFT JOIN back_apply_details bad ON bad.parent_id = bai.id
LEFT JOIN ma_type mt ON mt.type_id = bad.type_id
WHERE
tta.agreement_id = #{agreementId}
AND tt.task_type = '36'
and mt.type_id is not null
) AS subquery2 ON subquery1.type_id = subquery2.type_id
) AS result2 ON result1.typeId = result2.typeId
back_apply_details bad
LEFT JOIN back_apply_info bai ON bai.id = bad.parent_id
LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id
LEFT JOIN bm_agreement_info bagi ON bagi.agreement_id = tta.agreement_id
LEFT JOIN bm_project_lot lot ON lot.lot_id = bagi.project_id
LEFT JOIN bm_unit_info unit ON unit.unit_id = bagi.unit_id
LEFT JOIN ma_type mt ON mt.type_id = bad.type_id
LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE
bai.id = #{id}
</select>
<select id="getUseTypeTree" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
WITH RECURSIVE cte AS (

6
sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
View File

@ -92,7 +92,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>保存</el-button>
>新建</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -258,7 +258,7 @@ export default {
data() {
return {
// 遮罩层
loading: true,
loading: false,
// 选中数组
ids: [],
// 非单个禁用
@ -339,7 +339,7 @@ export default {
};
},
created() {
this.getList();
// this.getList();
},
methods: {
/** 查询角色列表 */

25
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
View File

@ -105,7 +105,7 @@
<!-- 验收弹窗 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="机具类型名称:" prop="machineTypeName">
<el-input v-model="form.machineTypeName" placeholder="" disabled/>
@ -126,15 +126,16 @@
<el-form-item label="验收图片" prop="checkUrl">
<el-upload
:http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#" :limit='1'
action="#"
:file-list="fileList"
:show-file-list="true"
:show-file-list="false"
list-type="picture-card"
accept=".png,.jpg,.jpeg"
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<i class="el-icon-plus avatar-uploader-icon"></i>
<img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-form>
@ -145,7 +146,7 @@
</el-dialog>
<!-- 批量验收弹窗 -->
<el-dialog :title="title" :visible.sync="openAll" width="600px" append-to-body>
<el-dialog :title="title" :visible.sync="openAll" width="650px" append-to-body>
<el-form ref="aform" :model="aform" :rules="arules" label-width="120px">
<el-form-item label="验收结论" prop="checkResult">
@ -155,15 +156,16 @@
<el-form-item label="验收图片" prop="checkUrl">
<el-upload
:http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#" :limit='1'
action="#"
:file-list="fileList"
:show-file-list="true"
:show-file-list="false"
list-type="picture-card"
accept=".png,.jpg,.jpeg"
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<i class="el-icon-plus avatar-uploader-icon"></i>
<img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-form>
@ -306,7 +308,7 @@ export default {
//上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
// uploadUrl:'http://10.40.92.140:9201',//本地测试
// uploadUrl:'http://192.168.5.12:9201',//本地测试
dialogImageUrl: '',
dialogVisible: false,
//--------------
@ -376,6 +378,7 @@ export default {
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
@ -389,7 +392,8 @@ export default {
inputNum: undefined,
checkUrl: undefined,
};
// this.resetForm("form");
this.imageUrl = ''
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -584,6 +588,7 @@ export default {
param.type = 'ma'
imgUpLoad(param).then(res => {
if(res.code == 200) {
this.imageUrl = res.data.fileUrl;
if(this.open){
this.form.checkUrl = res.data.fileUrl;
this.form.checkUrlName = res.data.fileName;

11
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
View File

@ -104,7 +104,7 @@
<el-input v-model="form.typeId" disabled v-show="false"/>
<el-col :span="7">
<el-form-item label="编码前缀" prop="exCode">
<el-input v-model="form.exCode" :readonly="true"/>
<el-input v-model="form.exCode" />
</el-form-item>
</el-col>
<el-col :span="7">
@ -331,9 +331,10 @@ export default {
this.form = row;
this.$set(this.form,'str','')
this.$set(this.form,'str1','')
this.$set(this.form,'fixCode','1')
// this.$set(this.form,'fixCode','1')
let arr = this.form.arrivalTime.split('-')
this.form.exCode = 'NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1];
// this.form.exCode = ;
this.$set(this.form,'exCode','NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1])
this.form.count = row.checkNum;
this.codeList=[]
this.open = true;
@ -382,7 +383,7 @@ export default {
if(sum>this.form.checkNum){
this.$modal.msgError("已绑定编码"+this.form.bindNum+"个,总数量已超过验收数量，请调整后缀范围。");
}else{
if(num1>num){
if(num1=>num){
for(let i = 0; i < count; i++) {
let obj = {
typeName:this.form.typeName,
@ -395,7 +396,7 @@ export default {
}
this.codeList.push(obj)
}
}else{
} else{
this.$modal.msgError("编码后缀范围输入格式不正确");
}
}

8
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -94,18 +94,14 @@
<el-table-column label="物品种类" align="center" prop="itemType" />
<el-table-column label="设备类型" align="center" prop="deviceType" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">-->
<!-- <router-link :to="'/system/dict-data/index/' + scope.row.maId" class="link-type">-->
<!-- <span>{{ scope.row.dictType }}</span>-->
<!-- </router-link>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="设备编码" align="center" prop="maCode" width="200" />
<el-table-column label="设备状态" align="center" prop="maStatusName">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.maStatusName"/>
</template>
</el-table-column>
<el-table-column label="采购单号" align="center" prop="buyTask" />
<el-table-column label="采购单号" align="center" prop="buyTask" width="180"/>
<el-table-column label="固定资产编号" align="center" prop="assetsCode" />
<el-table-column label="设备原编号" align="center" prop="preCode" />

12
sgzb-ui/src/views/store/tools/toolsSupplier.vue
View File

@ -84,7 +84,7 @@
<el-table-column label="主要经营范围" align="center" prop="businessScope" :show-overflow-tooltip="true" />
<el-table-column label="营业执照" align="center" prop="businessLicense" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span @click="openImg(scope.row.businessLicense)" style="color: #02A7F0;"> 查看 </span>
<span v-if="scope.row.businessLicense" @click="openImg(scope.row.businessLicense)" style="color: #02A7F0;"> 查看 </span>
</template>
</el-table-column>
@ -148,15 +148,16 @@
<el-form-item label="营业执照" prop="businessLicense">
<el-upload
:http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#" :limit='1'
action="#"
:file-list="fileList"
:show-file-list="true"
:show-file-list="false"
list-type="picture-card"
accept=".png,.jpg,.jpeg"
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<i class="el-icon-plus avatar-uploader-icon"></i>
<img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
@ -219,7 +220,7 @@ export default {
//上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
// uploadUrl:'http://192.168.4.2:9201',//本地测试
// uploadUrl:'http://192.168.5.12:9201',//本地测试
// 表单校验
rules: {
dictName: [
@ -297,6 +298,7 @@ export default {
const supplierId = row.supplierId || this.ids
getSupplierInfo(supplierId).then(response => {
this.form = response.data;
this.imageUrl = this.form.businessLicense
this.open = true;
this.title = "编辑";
});

29
sgzb-ui/src/views/store/tools/toolsType.vue
View File

@ -275,14 +275,15 @@
:http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#"
:file-list="fileList"
list-type="picture-card"
:show-file-list="false"
accept=".png,.jpg,.jpeg"
accept=".png,.jpg,.jpeg"
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<el-button size="small" type="primary" icon="el-icon-upload">上传</el-button>
<!-- <el-button size="small" type="primary" icon="el-icon-upload">上传</el-button> -->
<img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
<!-- <i class="el-icon-plus avatar-uploader-icon"></i> -->
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
@ -455,8 +456,8 @@ export default {
field101fileList:[],
//上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
// uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
uploadUrl:'http://192.168.5.12:9201',//本地测试
uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
// uploadUrl:'http://192.168.5.12:9201',//本地测试
defaultProps: {
children: "children",
label: "label"
@ -639,17 +640,13 @@ export default {
const typeId = row.typeId || this.ids;
getMaType(typeId).then(response => {
this.form = response.data;
// let file = {
// name:this.form.documentName,
// type:this.form.documentUrl,
// }
// this.field101fileList.push(file)
// let img = {
// name:this.form.photoName,
// type:this.uploadUrl+this.form.photoUrl,
// }
// this.fileList.push(img)
let file = {
name:this.form.documentName,
type:this.form.documentUrl,
}
this.field101fileList.push(file)
this.imageUrl = this.form.photoUrl
this.open = true;
this.title = "修改";
});

4
sgzb-ui/vue.config.js
View File

@ -36,9 +36,9 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//192.168.0.14
// target: `http://112.29.103.165:21624`,//线上环境
target: `http://112.29.103.165:21624`,//线上环境
// target: `http://192.168.0.14:21624`,//线上环境
target: `http://192.168.5.12:8080`,//丁
// target: `http://192.168.5.12:8080`,//丁
// target: `http://10.40.92.138:8080`,//丁/
// target: `http://10.40.92.126:8080`,//高
// target: `http://10.40.92.111:8080`,//亮