From 66f8df4fbac623b4c383a85df49f47993497fc87 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Sat, 20 Apr 2024 13:40:04 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix:=20=E6=A0=87=E7=AD=BE=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=AE=A1=E7=90=86-=E6=A0=87=E7=AD=BE=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=AE=A1=E7=90=86-=E8=AE=BE=E7=BD=AE=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/store/label/labelBinding.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue index b50e4a1e..58ed920d 100644 --- a/sgzb-ui/src/views/store/label/labelBinding.vue +++ b/sgzb-ui/src/views/store/label/labelBinding.vue @@ -690,6 +690,18 @@ this.form.labelCode = this.ids[0].labelCode getDeviceTypeTree({ level: '4' }).then((response) => { this.deptOptions = response.data + this.handleDeviceTypeTree(this.deptOptions) + }) + }, + handleDeviceTypeTree(data) { + // manageType有值且值不为0时, 禁用 + data.forEach((item) => { + if (item.manageType && item.manageType !== '0') { + item.isDisabled = true + } + if (item.children) { + this.handleDeviceTypeTree(item.children) + } }) }, /** 修改按钮操作 */ From 5a88bafd895f5200c173f0e682afc03ef822b282 Mon Sep 17 00:00:00 2001 From: jackal <13856223047@163.com> Date: Sat, 20 Apr 2024 13:41:35 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix:=E9=85=8D=E4=BB=B6=E6=96=B0=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newAccessory/newAccessoryAccept.vue | 16 +- .../newBuy/newAccessory/newAccessoryList.vue | 376 ++-- .../warehousing/accessoryWarehousing.vue | 1588 ++++++++--------- 3 files changed, 939 insertions(+), 1041 deletions(-) diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue index d10e2a67..c6c6c298 100644 --- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue @@ -216,6 +216,13 @@ v-if="!isCheck && scope.row.status==0" @click="handleDelete(scope.row)" >删除 + 删除 @@ -343,6 +350,7 @@ export default { }, taskId: '', isView: false, + isShow: false, isEdit: false, isCheck: false, addForm: { @@ -397,6 +405,12 @@ export default { }, }, created() { + const isShow = this.$route.query && this.$route.query.isShow + if (isShow && isShow == 'true') { + this.isShow = true + } else { + this.isShow = false + } const taskId = this.$route.query && this.$route.query.taskId this.taskId = taskId if (this.taskId == '' || !this.taskId) { @@ -406,14 +420,12 @@ export default { this.getTaskInfo() } const isView = this.$route.query && this.$route.query.isView - console.log(this.isView, 'isView') if (isView && isView == 'true') { this.isView = true } else { this.isView = false } const isCheck = this.$route.query && this.$route.query.isCheck - console.log(this.isCheck, 'isCheck') if (isCheck && isCheck == 'true') { this.isCheck = true } else { diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue index f6bf1c60..b563b276 100644 --- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue +++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue @@ -1,11 +1,19 @@ From 264bd77a4146fbe5e90fdf0af2cdff4ce046e7c8 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 20 Apr 2024 13:55:53 +0800 Subject: [PATCH 03/12] bug --- .../base/controller/BmProjectInfoController.java | 2 +- .../base/controller/BmProjectLotController.java | 2 +- .../base/controller/BmUnitInfoController.java | 3 +++ .../sgzb/base/mapper/BmProjectInfoMapper.java | 2 +- .../sgzb/base/mapper/BmProjectLotMapper.java | 2 +- .../bonus/sgzb/base/mapper/BmUnitInfoMapper.java | 2 +- .../com/bonus/sgzb/base/mapper/SysDicMapper.java | 2 +- .../sgzb/base/service/BmProjectInfoService.java | 2 +- .../sgzb/base/service/BmProjectLotService.java | 2 +- .../service/impl/BmProjectInfoServiceImpl.java | 14 ++++++++++---- .../service/impl/BmProjectLotServiceImpl.java | 15 +++++++++++---- .../base/service/impl/BmUnitInfoServiceImpl.java | 12 +++++++----- .../sgzb/base/service/impl/SysDicServiceImpl.java | 9 +++++---- .../resources/mapper/base/BmProjectInfoMapper.xml | 4 ++-- .../resources/mapper/base/BmProjectLotMapper.xml | 5 +++-- .../resources/mapper/base/BmUnitInfoMapper.xml | 4 ++-- .../main/resources/mapper/base/SysDicMapper.xml | 11 ++++++----- .../controller/PlanManagementController.java | 2 +- .../bonus/sgzb/material/domain/AgreementInfo.java | 6 ++++++ .../mapper/material/AgreementInfoMapper.xml | 6 ++++++ .../resources/mapper/material/BackApplyMapper.xml | 3 +++ 21 files changed, 73 insertions(+), 37 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java index e17988bc..86b3277f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java @@ -112,7 +112,7 @@ public class BmProjectInfoController extends BaseController{ public AjaxResult edit(@Validated @RequestBody BmProjectInfo bmProjectInfo) { - return toAjax(bmProjectInfoService.updateBmProjectInfo(bmProjectInfo)); + return bmProjectInfoService.updateBmProjectInfo(bmProjectInfo); } @Log(title = "项目管理导出", businessType = BusinessType.EXPORT) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java index 2b732253..166856c8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectLotController.java @@ -85,7 +85,7 @@ public class BmProjectLotController extends BaseController { @PutMapping public AjaxResult edit(@Validated @RequestBody BmProjectLot bmProjectLot) { - return toAjax(bmProjectLotService.updateBmProjectLot(bmProjectLot)); + return bmProjectLotService.updateBmProjectLot(bmProjectLot); } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index 30cc6966..600a0838 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -14,6 +14,7 @@ import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.system.api.domain.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -33,6 +34,7 @@ import java.util.stream.Collectors; @Api(tags = "往来单位") @RestController @RequestMapping("/bmUnitInfo") +@Slf4j public class BmUnitInfoController extends BaseController{ @Autowired @@ -106,6 +108,7 @@ public class BmUnitInfoController extends BaseController{ @PostMapping public AjaxResult unitInfoAdd(@Validated @RequestBody BmUnitInfo bmUnitInfo) { + log.info("新增往来单位参数：{}", bmUnitInfo); return bmUnitInfoService.unitInfoAdd(bmUnitInfo); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java index ff976035..5982c416 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectInfoMapper.java @@ -21,5 +21,5 @@ public interface BmProjectInfoMapper { public int deleteProjectInfoById(Long proId); - int selectByName(String proName); + BmProjectInfo selectByName(String proName); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java index 624700c7..1b726dbb 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmProjectLotMapper.java @@ -20,5 +20,5 @@ public interface BmProjectLotMapper { public int deleteProjectLotById(Long lotId); - int selectByName(String lotName); + BmProjectLot selectByName(String lotName); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java index fdf85a6d..42a9ab83 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java @@ -26,5 +26,5 @@ public interface BmUnitInfoMapper { public int deleteUnitInfoById(Long unitId); - Integer selectByName(String unitName); + BmUnitInfo selectByName(String unitName); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java index 53c5fd0e..32a70fc3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java @@ -82,5 +82,5 @@ public interface SysDicMapper * @param name * @return */ - Integer selectByName(String name); + SysDic selectByName(String name); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java index 1c5419e0..e31e25f6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectInfoService.java @@ -16,7 +16,7 @@ public interface BmProjectInfoService { public void remove(Long[] proIds); - public int updateBmProjectInfo(BmProjectInfo bmProjectInfo); + public AjaxResult updateBmProjectInfo(BmProjectInfo bmProjectInfo); public int deleteProjectInfoById(Long proId); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java index f5cb18f4..f5c9fbc0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmProjectLotService.java @@ -15,7 +15,7 @@ public interface BmProjectLotService { public void remove(Long[] proIds); - public int updateBmProjectLot(BmProjectLot bmProjectLot); + public AjaxResult updateBmProjectLot(BmProjectLot bmProjectLot); public int deleteProjectLotById(Long lotId); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java index 4d622035..f4a7a983 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java @@ -34,8 +34,8 @@ public class BmProjectInfoServiceImpl implements BmProjectInfoService { @Override public AjaxResult projectInfoAdd(BmProjectInfo bmProjectInfo) { - int count = bmProjectInfoMapper.selectByName(bmProjectInfo.getProName()); - if (count != 0) { + BmProjectInfo info = bmProjectInfoMapper.selectByName(bmProjectInfo.getProName()); + if (StringUtils.isNotNull(info)) { return AjaxResult.error("新增工程项目名称重复，请重新提交！！！"); } return AjaxResult.success(bmProjectInfoMapper.projectInfoAdd(bmProjectInfo)); @@ -47,8 +47,14 @@ public class BmProjectInfoServiceImpl implements BmProjectInfoService { } @Override - public int updateBmProjectInfo(BmProjectInfo bmProjectInfo) { - return bmProjectInfoMapper.updateBmProjectInfo(bmProjectInfo); + public AjaxResult updateBmProjectInfo(BmProjectInfo bmProjectInfo) { + if (StringUtils.isNotEmpty(bmProjectInfo.getProName())) { + BmProjectInfo info = bmProjectInfoMapper.selectByName(bmProjectInfo.getProName()); + if (StringUtils.isNotNull(info) && info.getProId() != bmProjectInfo.getProId()) { + return AjaxResult.error("修改工程项目名称重复，请重新提交！！！"); + } + } + return AjaxResult.success(bmProjectInfoMapper.updateBmProjectInfo(bmProjectInfo)); } @Override diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java index c73f4371..04d77d9b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectLotServiceImpl.java @@ -4,6 +4,7 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.domain.BmProjectLot; import com.bonus.sgzb.base.mapper.BmProjectLotMapper; import com.bonus.sgzb.base.service.BmProjectLotService; +import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,8 +31,8 @@ public class BmProjectLotServiceImpl implements BmProjectLotService { @Override public AjaxResult projectLotAdd(BmProjectLot bmProjectLot) { - int count = bmProjectLotMapper.selectByName(bmProjectLot.getLotName()); - if (count != 0) { + BmProjectLot info = bmProjectLotMapper.selectByName(bmProjectLot.getLotName()); + if (StringUtils.isNotNull(info)) { return AjaxResult.error("新增标段工程名称重复，请重新提交！！！"); } return AjaxResult.success(bmProjectLotMapper.projectLotAdd(bmProjectLot)); @@ -43,8 +44,14 @@ public class BmProjectLotServiceImpl implements BmProjectLotService { } @Override - public int updateBmProjectLot(BmProjectLot bmProjectLot) { - return bmProjectLotMapper.updateBmProjectLot(bmProjectLot); + public AjaxResult updateBmProjectLot(BmProjectLot bmProjectLot) { + if (StringUtils.isNotEmpty(bmProjectLot.getLotName())) { + BmProjectLot info = bmProjectLotMapper.selectByName(bmProjectLot.getLotName()); + if (StringUtils.isNotNull(info) && info.getLotId() != bmProjectLot.getLotId()) { + return AjaxResult.error("修改标段工程名称重复，请重新提交！！！"); + } + } + return AjaxResult.success(bmProjectLotMapper.updateBmProjectLot(bmProjectLot)); } @Override diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java index 187c527f..4652f1c8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java @@ -46,8 +46,8 @@ public class BmUnitInfoServiceImpl implements BmUnitInfoService { @Override public AjaxResult unitInfoAdd(BmUnitInfo bmUnitInfo) { - Integer count = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName()); - if (count != 0) { + BmUnitInfo info = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName()); + if (StringUtils.isNotNull(info)) { return AjaxResult.error("新增往来单位名称重复，请重新提交！！！"); } return AjaxResult.success(bmUnitInfoMapper.unitInfoAdd(bmUnitInfo)); @@ -60,9 +60,11 @@ public class BmUnitInfoServiceImpl implements BmUnitInfoService { @Override public AjaxResult updateBmUnitInfo(BmUnitInfo bmUnitInfo) { - Integer count = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName()); - if (count != 0) { - return AjaxResult.error("往来单位名称已经存在，请重新修改提交！！！"); + if (StringUtils.isNotEmpty(bmUnitInfo.getUnitName())) { + BmUnitInfo info = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName()); + if (StringUtils.isNotNull(info) && info.getUnitId() != bmUnitInfo.getUnitId()) { + return AjaxResult.error("往来单位名称已经存在，请重新修改提交！！！"); + } } return AjaxResult.success(bmUnitInfoMapper.updateBmUnitInfo(bmUnitInfo)); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java index 07f482f7..5708e80a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java @@ -7,6 +7,7 @@ import com.bonus.sgzb.base.domain.BmUnitType; import com.bonus.sgzb.base.mapper.SysDicMapper; import com.bonus.sgzb.base.service.ISysDicService; import com.bonus.sgzb.common.core.utils.DateUtils; +import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -79,8 +80,8 @@ public class SysDicServiceImpl implements ISysDicService public AjaxResult insertSysDic(SysDic sysDic) { sysDic.setCreateTime(DateUtils.getNowDate()); - Integer count = sysDicMapper.selectByName(sysDic.getName()); - if (count != 0) { + SysDic info = sysDicMapper.selectByName(sysDic.getName()); + if (StringUtils.isNotNull(info)) { return AjaxResult.error("新增单位类型名称重复，请重新提交！！！"); } return AjaxResult.success(sysDicMapper.insertSysDic(sysDic)); @@ -95,8 +96,8 @@ public class SysDicServiceImpl implements ISysDicService @Override public AjaxResult updateSysDic(SysDic sysDic) { - Integer count = sysDicMapper.selectByName(sysDic.getName()); - if (count != 0) { + SysDic info = sysDicMapper.selectByName(sysDic.getName()); + if (StringUtils.isNotNull(info) && info.getId().longValue() != sysDic.getId()) { return AjaxResult.error("单位类型名称已经存在，请重新修改提交！！！"); } return AjaxResult.success(sysDicMapper.updateSysDic(sysDic)); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml index d1a39e7c..61ff5b82 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml @@ -138,8 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.company_id = #{companyId} - + select * from bm_project_info where 1 = 1 and pro_name = #{proName} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml index a0079479..b2589849 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml @@ -86,12 +86,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY a.lot_id DESC - + select * from bm_project_lot where 1 = 1 and lot_name = #{lotName} + insert into bm_project_lot ( lot_name, diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml index 61bada04..9cc45fb4 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml @@ -171,8 +171,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND type_name = #{typeName} - + select * from bm_unit_info where 1 = 1 and unit_name = #{unitName} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysDicMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysDicMapper.xml index bba515ed..d753cde6 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysDicMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysDicMapper.xml @@ -63,12 +63,13 @@ where id = '0' - + select * from sys_dic + where + 1 = 1 + and name = #{name} + insert into sys_dic diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanManagementController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanManagementController.java index 6197b591..ee36add0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanManagementController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PlanManagementController.java @@ -130,7 +130,7 @@ public class PlanManagementController extends BaseController { */ @ApiOperation("根据id删除计划管理") @DeleteMapping("/deleteById/{planId}") - public AjaxResult addOrUpdate(@PathVariable(name = "计划ID",value = "planId") Long planId){ + public AjaxResult addOrUpdate(@PathVariable(value = "planId") Long planId){ return AjaxResult.success(planManagementService.deleteById(planId)); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java index dc6bf9cb..bf75bae8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** * @author lsun @@ -129,4 +130,9 @@ public class AgreementInfo extends BaseEntity { private String cost; @ApiModelProperty(value = "结算状态") private String sltStatus; + + /** 导出选中列表 */ + @ApiModelProperty(value = "导出选中列表") + private List dataCondition; + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml index 3c4ca5f4..613bca23 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml @@ -121,6 +121,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.lot_id = #{projectId} + + AND bai.agreement_id in + + #{agreementId} + + ORDER BY bai.agreement_id DESC diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index ea3df5d3..f00f4267 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -688,6 +688,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bai.back_time =#{time} + + + GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time ORDER BY bai.create_time desc From 43ecf2685360ec9610b6cca99fe03027887d0ceb Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sat, 20 Apr 2024 14:00:22 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=A7=A3=E7=BB=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/service/impl/MaintenanceGangServiceImpl.java | 6 +++--- .../sgzb/base/service/impl/WarehouseKeeperServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaintenanceGangServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaintenanceGangServiceImpl.java index 86251b10..451a0d2c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaintenanceGangServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaintenanceGangServiceImpl.java @@ -56,15 +56,15 @@ public class MaintenanceGangServiceImpl implements MaintenanceGangService { @Override public int deleteByIds(MaintenanceGang bean) { - int i = 0; + int i = 1; if(StringHelper.isNotEmpty(bean.getType())){ if("1".equals(bean.getType())){ - i = MaintenanceGangMapper.deleteByIds(bean.getTypeIds()); + MaintenanceGangMapper.deleteByIds(bean.getTypeIds()); }else{ if(StringHelper.isNotEmpty(bean.getTypeIds())){ List list = new ArrayList<>(); String[] splitTypeIds = bean.getTypeIds().split("@"); - i = MaintenanceGangMapper.deleteByIdsAll(splitTypeIds); + MaintenanceGangMapper.deleteByIdsAll(splitTypeIds); } } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/WarehouseKeeperServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/WarehouseKeeperServiceImpl.java index dba39925..f7517fe7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/WarehouseKeeperServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/WarehouseKeeperServiceImpl.java @@ -58,15 +58,15 @@ public class WarehouseKeeperServiceImpl implements WarehouseKeeperService { @Override public int deleteByIds(WarehouseKeeper bean) { - int i = 0; + int i = 1; if(StringHelper.isNotEmpty(bean.getType())){ if("1".equals(bean.getType())){ - i = warehouseKeeperMapper.deleteByIds(bean.getTypeIds()); + warehouseKeeperMapper.deleteByIds(bean.getTypeIds()); }else{ if(StringHelper.isNotEmpty(bean.getTypeIds())){ List list = new ArrayList<>(); String[] splitTypeIds = bean.getTypeIds().split("@"); - i = warehouseKeeperMapper.deleteByIdsAll(splitTypeIds); + warehouseKeeperMapper.deleteByIdsAll(splitTypeIds); } } } From 0d457afa9d8fb19bf1433350cceda9e41c4e2393 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Sat, 20 Apr 2024 14:01:11 +0800 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=E4=BB=93=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E4=BB=93=E5=BA=93=E8=B4=A7=E6=9E=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E7=BC=96=E8=BE=91=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/store/shelves/shelvesList.vue | 3 +++ sgzb-ui/vue.config.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sgzb-ui/src/views/store/shelves/shelvesList.vue b/sgzb-ui/src/views/store/shelves/shelvesList.vue index 133ac5e9..909d8056 100644 --- a/sgzb-ui/src/views/store/shelves/shelvesList.vue +++ b/sgzb-ui/src/views/store/shelves/shelvesList.vue @@ -269,6 +269,9 @@ export default { this.open = true; this.title = "修改"; }); + listHouse().then(response => { + this.deptOptions = this.handleTree(response.data, "houseId"); + }); // listDeptExcludeChild(row.houseId).then(response => { // this.deptOptions = this.handleTree(response.data, "houseId"); // }); diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 750c4ea9..f82635e5 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,8 +43,8 @@ module.exports = { // target: `https://z.csgmall.com.cn`, // target: `http://10.40.92.8:8080`, //超 - target: `http://10.40.92.81:8080`, //韩 - // target: `http://10.40.92.209:8080`,//川/ + // target: `http://10.40.92.81:8080`, //韩 + target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.153:8080`, //帅 // target: `http://10.40.92.14:8080`, //福 From 0da44483df4e00e433b62cf859a54397fae90dac Mon Sep 17 00:00:00 2001 From: jackal <13856223047@163.com> Date: Sat, 20 Apr 2024 14:10:33 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7b?= =?UTF-8?q?ug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../claimAndRefund/return/returnApplyAdd.vue | 477 ++++++++---------- 1 file changed, 212 insertions(+), 265 deletions(-) diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue index c14464b7..91370c9b 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue @@ -12,35 +12,25 @@ - - + - - + @@ -71,14 +61,14 @@ type="date" value-format="yyyy-MM-dd" placeholder="选择时间" - > - + > @@ -94,29 +84,15 @@ /> - + - 退料管理 + 退料管理 - 保存 + 保存 @@ -127,12 +103,9 @@ size="mini" @click="handleExport" v-hasPermi="['system:role:export']" - >导出 --> + >导出--> - + - + - - + + - - - + + - + @@ -225,8 +172,8 @@ From 7126f3e744f9ad71a4312eb1720aa1b78e3a5659 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sat, 20 Apr 2024 14:18:17 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/service/impl/BmUnitInfoServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java index 187c527f..9a4676e8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java @@ -60,10 +60,10 @@ public class BmUnitInfoServiceImpl implements BmUnitInfoService { @Override public AjaxResult updateBmUnitInfo(BmUnitInfo bmUnitInfo) { - Integer count = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName()); - if (count != 0) { - return AjaxResult.error("往来单位名称已经存在，请重新修改提交！！！"); - } +// Integer count = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName()); +// if (count != 0) { +// return AjaxResult.error("往来单位名称已经存在，请重新修改提交！！！"); +// } return AjaxResult.success(bmUnitInfoMapper.updateBmUnitInfo(bmUnitInfo)); } From ff93691d19f7d5d5c353935eaa8292c2adce2730 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sat, 20 Apr 2024 14:29:59 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-auth/src/main/resources/bootstrap.yml | 4 ++-- sgzb-gateway/src/main/resources/bootstrap.yml | 6 +++--- sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml | 4 ++-- sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml | 4 ++-- sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml index 4403efeb..9e325d85 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml index b9ca7b0b..f58aa706 100644 --- a/sgzb-gateway/src/main/resources/bootstrap.yml +++ b/sgzb-gateway/src/main/resources/bootstrap.yml @@ -27,11 +27,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml @@ -48,7 +48,7 @@ spring: datasource: ds1: nacos: - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 dataId: sentinel-sgzb-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml index 3b8b43c1..d91e9508 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml @@ -21,11 +21,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index 57188a62..8fde59f5 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -21,11 +21,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml index 065335fd..d67b9907 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml @@ -25,11 +25,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 10.40.92.74:8848 + server-addr: 192.168.0.14:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml From 8dc56bcde98b6630ebb35abbe7b3ade9c139b967 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Sat, 20 Apr 2024 14:29:59 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A2=86=E9=80=80?= =?UTF-8?q?=E6=96=99=E6=A8=A1=E5=9D=97=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receive/receiveApplyAdd.vue | 2 +- .../claimAndRefund/receive/receiveExamine.vue | 6 +-- .../receiveByCq/receiveApply.vue | 2 +- .../receiveByCq/receiveApplyAddByCq.vue | 6 ++- .../receiveByCq/receiveExamineByCq.vue | 42 ++++++++++--------- .../receiveByCq/receiveManage.vue | 4 +- .../claimAndRefund/return/returnApplyAdd.vue | 14 ++++++- .../return/returnApplyAddByCq.vue | 15 ++++++- .../claimAndRefund/return/returnInDetail.vue | 2 +- .../cost/csotSettlement/costApplyAdd.vue | 2 +- sgzb-ui/src/views/monitor/job/log.vue | 2 +- .../newBuy/newDevices/newDevicesCode.vue | 2 +- sgzb-ui/src/views/store/newBuy/planAdd.vue | 2 +- 13 files changed, 65 insertions(+), 36 deletions(-) diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue index 47af551d..13954c3b 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue @@ -327,7 +327,7 @@ export default { }, } }, - created() { + mounted() { this.GetUserInfo() this.GetUnitData() diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue index 11c14d42..00efea36 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue @@ -1,5 +1,5 @@ diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index b0c5767e..3edf076b 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,9 +43,9 @@ module.exports = { // target: `https://z.csgmall.com.cn`, // target: `http://10.40.92.8:8080`, //超 - // target: `http://10.40.92.81:8080`, //韩 + target: `http://10.40.92.81:8080`, //韩 // target: `http://10.40.92.74:8080`,//旭/ - target: `http://10.40.92.153:8080`, //帅 + // target: `http://10.40.92.153:8080`, //帅 // target: `http://10.40.92.14:8080`, //福 //******** 注意事项 ********* */