diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index b78e3d28..0ff43bbd 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -272,6 +272,8 @@ public class SysLoginService { public static String generateRandomPassword(int length) { String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; Random random = new Random(); + + StringBuilder password = new StringBuilder(); for (int i = 0; i < length; i++) { diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml index 9e325d85..e8b1c5d3 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9200 + port: 29200 # Spring spring: @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1: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 f58aa706..2968520f 100644 --- a/sgzb-gateway/src/main/resources/bootstrap.yml +++ b/sgzb-gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8080 + port: 28080 # Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问 management: @@ -27,11 +27,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 9ea59c53..01851002 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -140,6 +140,8 @@ public class BackReceiveController extends BaseController { return AjaxResult.success("接收成功"); } else if (res == -1) { return AjaxResult.error("该编码已接收"); + } else if (res == -2) { + return AjaxResult.error("已超出退料数量！！"); } else { return AjaxResult.error("接收失败"); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 1e436d51..4ee721dc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -165,6 +165,7 @@ public class BackApplyInfo { private List backApplyDetails; private Integer parentId; private String sdStatus; + private String sdId; /** * 二维码编码 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 35b375c9..a8d6b0e0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -160,7 +160,7 @@ public interface BackReceiveMapper { * @param record * @return List */ - BackApplyInfo backReceiveRecord(BackApplyInfo record); + List backReceiveRecord(BackApplyInfo record); /** * 查询 @@ -194,4 +194,8 @@ public interface BackReceiveMapper { int deleteCheckDetails(BackApplyInfo backApplyInfo); List getMaId(BackApplyInfo backApplyInfo); + + int selectNumByTypeId(@Param("parentId")Integer parentId,@Param("typeId") String typeId); + + int selectTaskStatus(int taskId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index e55457d6..a04958fd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -108,14 +108,20 @@ public class BackReceiveServiceImpl implements BackReceiveService { BackApplyInfo[] arr = record.getArr(); if (arr.length > 0) { for (int i = 0; i < arr.length; i++) { + //判断是否超出审核数量 + int re = backReceiveMapper.selectNumByTypeId(arr[i].getParentId(), arr[i].getTypeId()); + if (re <= 0) { + res = -2; + break; + } //根据maId和taskId查询是否已接收 - int re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId()); + re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId()); if (re > 0) { res = -1; break; } } - if (res == -1) { + if (res < 0) { return res; } } @@ -123,7 +129,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { //修改任务状态 res = updateTaskStatus(taskId, 39); if (res == 0) { - throw new RuntimeException("插入back_check_details异常"); + throw new RuntimeException("修改updateTaskStatus异常"); } //插入back_check_details res = insertBcd(record); @@ -142,6 +148,11 @@ public class BackReceiveServiceImpl implements BackReceiveService { int res; try { int taskId = record.getTaskId(); + //先判断是否已经完成退料了 + int taskStatus = selectTaskStatus(taskId); + if (taskStatus == 0) { + throw new RuntimeException("该退料单已完成退料"); + } //修改任务状态 res = updateTaskStatus(taskId, 40); if (res == 0) { @@ -191,7 +202,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { if (allList != null && allList.size() > 0) { res = updateSlt(record, allList); if (res == 0) { - throw new RuntimeException("slt_agreement_info"); + throw new RuntimeException("该机具未被领料使用"); } } } catch (Exception e) { @@ -200,6 +211,15 @@ public class BackReceiveServiceImpl implements BackReceiveService { return res; } + private int selectTaskStatus(int taskId) { + int taskStatus = backReceiveMapper.selectTaskStatus(taskId); + if (taskStatus == 40) { + return 0; + } else { + return 1; + } + } + private int updateSlt(BackApplyInfo record, List hgList) { for (BackApplyInfo bean : hgList) { List infoList = backReceiveMapper.getStlInfo(bean); @@ -239,16 +259,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { @Override public List backReceiveRecord(BackApplyInfo record) { - String typeId = record.getTypeId(); - String[] split = typeId.split(","); - List backApplyInfoList = new ArrayList<>(); - for (String s : split) { - record.setTypeId(s); - BackApplyInfo backApplyInfo = backReceiveMapper.backReceiveRecord(record); - if (backApplyInfo != null) { - backApplyInfoList.add(backApplyInfo); - } - } + + List backApplyInfoList = backReceiveMapper.backReceiveRecord(record); + return backApplyInfoList; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 7cb5c71f..66052870 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -92,13 +92,17 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (CollUtil.isEmpty(maMachineByMaIdAndMaCode)) { maMachine.setCreateTime(new Date()); int i = maMachineMapper.maMachineAdd(maMachine); + String labelCode = maMachine.getQrCode(); MaLabelBind maLabelBinds = maLabelBindMapper.selectMaLabelBindByMaCode(maMachine); if (maLabelBinds != null) { + MaLabelBindVO maLabelBind = new MaLabelBindVO(); maLabelBind.setTypeId(maMachine.getTypeId()); maLabelBind.setBindTime(new Date().toString()); + maLabelBind.setBinder(SecurityUtils.getLoginUser().getUsername()); maLabelBindMapper.updateMaLabelBind(maLabelBind); + return 0; } else { MaLabelBind maLabelBind = new MaLabelBind(); @@ -106,10 +110,13 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { maLabelBind.setMaId(maMachine.getMaId()); maLabelBind.setTypeId(maMachine.getTypeId()); maLabelBind.setBindTime(new Date()); + maLabelBind.setBinder(SecurityUtils.getLoginUser().getUsername()); maLabelBind.setStatus("1"); maLabelBind.setLabelType(9); maLabelBindMapper.insertLabelBind(maLabelBind); + maLabelBindMapper.updateMalableCode(maLabelBind); + maLabelBindMapper.updateMatypeNum(maLabelBind); return 0; } } else { @@ -185,7 +192,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.error("您已提交，请勿重复点击"); } } catch (Exception e) { - log.error(e.getMessage()); + e.printStackTrace(); return AjaxResult.error("出库失败"); } return AjaxResult.success("出库成功"); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index d8e6a413..54db21d3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -1055,7 +1055,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } catch (Exception e) { log.error(e.getMessage(), e); - e.printStackTrace(); + } return res; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java index 95600b21..736013a4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java @@ -90,4 +90,8 @@ public interface MaLabelBindMapper int insertLabelBind(MaLabelBind maLabelBind); MaLabelBind selectMaLabelBindByMaCode(MaMachine maMachine); + + void updateMalableCode(MaLabelBind maLabelBind); + + void updateMatypeNum(MaLabelBind maLabelBind); } 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 f7517fe7..97a41b8d 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 @@ -35,7 +35,7 @@ public class WarehouseKeeperServiceImpl implements WarehouseKeeperService { public int add(WarehouseKeeper bean) { List list = new ArrayList<>(); String typeIds = bean.getTypeIds(); - if(StringHelper.isNotEmpty(typeIds)){ + if (StringHelper.isNotEmpty(typeIds)) { String[] splitTypeIds = typeIds.split("@"); //先删除，在去添加 warehouseKeeperMapper.deleteByIdsAll(splitTypeIds); @@ -47,11 +47,9 @@ public class WarehouseKeeperServiceImpl implements WarehouseKeeperService { list.add(beans); } } - int i =0; - if(list.size()>0){ - i= warehouseKeeperMapper.add(list); - }else{ - + int i = 0; + if (list.size() > 0) { + i = warehouseKeeperMapper.add(list); } return i; } @@ -59,11 +57,11 @@ public class WarehouseKeeperServiceImpl implements WarehouseKeeperService { @Override public int deleteByIds(WarehouseKeeper bean) { int i = 1; - if(StringHelper.isNotEmpty(bean.getType())){ - if("1".equals(bean.getType())){ + if (StringHelper.isNotEmpty(bean.getType())) { + if ("1".equals(bean.getType())) { warehouseKeeperMapper.deleteByIds(bean.getTypeIds()); - }else{ - if(StringHelper.isNotEmpty(bean.getTypeIds())){ + } else { + if (StringHelper.isNotEmpty(bean.getTypeIds())) { List list = new ArrayList<>(); String[] splitTypeIds = bean.getTypeIds().split("@"); warehouseKeeperMapper.deleteByIdsAll(splitTypeIds); diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml index d91e9508..e778cf56 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9301 + port: 29301 # Spring spring: @@ -21,11 +21,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml index 00a9176f..cc6eadb2 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml @@ -483,6 +483,7 @@ - + select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') and task_type = #{taskType} select ma_id from back_check_details where parent_id = #{parentId} and type_id = #{typeId} - - + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index fd5e255f..45f8f0b7 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -16,6 +16,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + task_id, task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml index a1798b36..b6884aef 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml @@ -194,6 +194,16 @@ ma_id = #{maId},is_bind =#{isBind} where label_id =#{labelId} + + update ma_machine_label set + ma_id = #{maId},is_bind =1 + where label_code =#{labelCode} + + + update ma_type set + num = num + 1 + where type_id =#{typeId} + insert into ma_maLabel diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java index 21c1d523..f260cb28 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java @@ -22,7 +22,7 @@ public class SgzbMaterialApplication public static void main(String[] args) { SpringApplication.run(SgzbMaterialApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 基础管理模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.out.println("(♥◠‿◠)ﾉﾞ 机具管理模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index 1513bde0..2fdb2386 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -5,6 +5,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.sgzb.common.security.utils.SecurityUtils; +import com.bonus.sgzb.material.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; @@ -23,15 +24,14 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; /** * 新购验收任务 - * + * * @author bonus * @date 2023-12-10 */ @RestController @Api(value = "新购验收任务") @RequestMapping("/purchaseCheckInfo") -public class PurchaseCheckInfoController extends BaseController -{ +public class PurchaseCheckInfoController extends BaseController { @Autowired private IPurchaseCheckInfoService purchaseCheckInfoService; @@ -52,20 +52,30 @@ public class PurchaseCheckInfoController extends BaseController //若依框架多个查询会导致分页失效，需分批处理 startPage(); list = purchaseCheckInfoService.selectPutInListExamine(purchaseCheckInfo); - }else { + } else { startPage(); list = purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo); } return getDataTable(list); } + /** + * 成套机具明细查看 + */ + @ApiOperation("成套机具明细查看") + @GetMapping("/wholeSetDetails") + public TableDataInfo wholeSetDetails(PurchaseCheckInfo purchaseCheckInfo) { + startPage(); + List list = purchaseCheckInfoService.getWholeSetDetails(purchaseCheckInfo); + return getDataTable(list); + } + /** * 查询新购验收任务列表 */ @ApiOperation("查询新购验收任务列表") @GetMapping("/list") - public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo) - { + public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo) { startPage(); List list = purchaseCheckInfoService.selectPurchaseCheckInfoList(purchaseCheckInfo); return getDataTable(list); @@ -77,8 +87,7 @@ public class PurchaseCheckInfoController extends BaseController @ApiOperation("导出新购验收任务列表") @Log(title = "新购验收任务", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) - { + public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { List list = purchaseCheckInfoService.exportList(purchaseCheckInfo); ExcelUtil util = new ExcelUtil(PurchaseCheckInfo.class); util.exportExcel(response, list, "新购验收任务数据"); @@ -90,8 +99,7 @@ public class PurchaseCheckInfoController extends BaseController @ApiOperation("导出新购工机具入库") @Log(title = "导出新购工机具入库", businessType = BusinessType.EXPORT) @PostMapping("/putInExport") - public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) - { + public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) { List list = purchaseCheckInfoService.putInExportList(purchaseCheckInfo); ExcelUtil util = new ExcelUtil(PurchaseInput.class); util.exportExcel(response, list, "新购工机具入库"); @@ -103,9 +111,8 @@ public class PurchaseCheckInfoController extends BaseController @ApiOperation("获取新购验收任务详细信息") @GetMapping(value = "/getDetails") public AjaxResult getInfo(@RequestParam(required = false) Long taskId, - @RequestParam(required = false) String keyWord) - { - return success(purchaseCheckInfoService.selectPurchaseCheckInfoByTaskId(taskId,keyWord)); + @RequestParam(required = false) String keyWord) { + return success(purchaseCheckInfoService.selectPurchaseCheckInfoByTaskId(taskId, keyWord)); } /** @@ -114,9 +121,8 @@ public class PurchaseCheckInfoController extends BaseController @ApiOperation("获取新购验收任务验收单") @GetMapping(value = "/getAcceptanceForm") public AjaxResult getAcceptanceForm(@RequestParam(required = false) Long taskId, - @RequestParam(required = false) String keyWord) - { - return success(purchaseCheckInfoService.getAcceptanceForm(taskId,keyWord)); + @RequestParam(required = false) String keyWord) { + return success(purchaseCheckInfoService.getAcceptanceForm(taskId, keyWord)); } /** @@ -125,8 +131,7 @@ public class PurchaseCheckInfoController extends BaseController @ApiOperation("新增新购验收任务") @Log(title = "新购验收任务", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody PurchaseCheckInfo purchaseCheckInfo) - { + public AjaxResult add(@RequestBody PurchaseCheckInfo purchaseCheckInfo) { return toAjax(purchaseCheckInfoService.insertPurchaseCheckInfo(purchaseCheckInfo)); } @@ -154,9 +159,8 @@ public class PurchaseCheckInfoController extends BaseController */ @ApiOperation("删除新购验收任务") @Log(title = "新购验收任务", businessType = BusinessType.DELETE) - @DeleteMapping("/{taskId}") - public AjaxResult remove(@PathVariable Long taskId) - { + @DeleteMapping("/{taskId}") + public AjaxResult remove(@PathVariable Long taskId) { return toAjax(purchaseCheckInfoService.deletePurchaseCheckInfoByTaskId(taskId)); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java index 44b601cd..cc30fe69 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.material.domain.BmNoticeInfo; +import com.bonus.sgzb.material.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import org.apache.ibatis.annotations.Mapper; @@ -10,16 +11,15 @@ import java.util.List; /** * 新购验收任务purchase_check_infoMapper接口 - * + * * @author bonus * @date 2023-12-10 */ @Mapper -public interface PurchaseCheckInfoMapper -{ +public interface PurchaseCheckInfoMapper { /** * 查询新购验收任务purchase_check_info - * + * * @param taskId 新购验收任务purchase_check_info主键 * @return 新购验收任务purchase_check_info */ @@ -27,7 +27,7 @@ public interface PurchaseCheckInfoMapper /** * 查询新购验收任务purchase_check_info列表 - * + * * @param purchaseCheckInfo 新购验收任务purchase_check_info * @return 新购验收任务purchase_check_info集合 */ @@ -35,7 +35,7 @@ public interface PurchaseCheckInfoMapper /** * 新增新购验收任务purchase_check_info - * + * * @param purchaseCheckInfo 新购验收任务purchase_check_info * @return 结果 */ @@ -43,7 +43,7 @@ public interface PurchaseCheckInfoMapper /** * 修改新购验收任务purchase_check_info - * + * * @param purchaseCheckInfo 新购验收任务purchase_check_info * @return 结果 */ @@ -51,7 +51,7 @@ public interface PurchaseCheckInfoMapper /** * 删除新购验收任务purchase_check_info - * + * * @param taskId 新购验收任务purchase_check_info主键 * @return 结果 */ @@ -59,7 +59,7 @@ public interface PurchaseCheckInfoMapper /** * 批量删除新购验收任务purchase_check_info - * + * * @param taskIds 需要删除的数据主键集合 * @return 结果 */ @@ -67,14 +67,15 @@ public interface PurchaseCheckInfoMapper /** * 查询新购入库任务列表 - * @param taskId - ** @param type 1-验收，2-入库 + * + * @param taskId * @param type 1-验收，2-入库 * @return */ - String selectTypeNameByTaskId(@Param("taskId") Long taskId,@Param("type") String type); + String selectTypeNameByTaskId(@Param("taskId") Long taskId, @Param("type") String type); /** * 插入 + * * @param bmNoticeInfo * @return */ @@ -82,6 +83,7 @@ public interface PurchaseCheckInfoMapper /** * 查询 + * * @param purchaseCheckInfo * @return */ @@ -89,12 +91,15 @@ public interface PurchaseCheckInfoMapper /** * 新购验收 + * * @param purchaseCheckInfo * @return */ List exportList(PurchaseCheckInfo purchaseCheckInfo); + /** * 新购入库导出 + * * @param purchaseCheckInfo * @return */ @@ -102,6 +107,7 @@ public interface PurchaseCheckInfoMapper /** * 查询 + * * @param purchaseCheckInfo * @return */ @@ -109,8 +115,11 @@ public interface PurchaseCheckInfoMapper /** * 查询 类型名称和管理类型 + * * @param taskId * @return */ List selectTypeNameAndManageTypeByTaskId(Long taskId); + + List getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java index 12ccb5e4..8d3c2fcc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.material.domain.BmNoticeInfo; +import com.bonus.sgzb.material.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.vo.NoticeInfoVO; @@ -107,4 +108,6 @@ public interface IPurchaseCheckInfoService * @return */ List selectPutInListExamine(PurchaseCheckInfo purchaseCheckInfo); + + List getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 0f9b8a10..087e59b5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -205,6 +205,7 @@ public class BackApplyServiceImpl implements BackApplyService { } else { return AjaxResult.error("未获取到参数"); } + return AjaxResult.success("修改成功"); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index b5563ae0..35d6d9fd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -67,7 +67,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public List selectPutInListList(PurchaseCheckInfo purchaseCheckInfo) { List purchaseCheckInfos = purchaseCheckInfoMapper.selectPutInListList(purchaseCheckInfo); for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) { - String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(),"2"); + String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(), "2"); checkInfo.setPurchasingTypeName(typeName); } return purchaseCheckInfos; @@ -101,12 +101,17 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public List selectPutInListExamine(PurchaseCheckInfo purchaseCheckInfo) { List purchaseCheckInfos = purchaseCheckInfoMapper.selectPutInListExamine(purchaseCheckInfo); for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) { - String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(),"3"); + String typeName = purchaseCheckInfoMapper.selectTypeNameByTaskId(checkInfo.getTaskId(), "3"); checkInfo.setPurchasingTypeName(typeName); } return purchaseCheckInfos; } + @Override + public List getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo) { + return purchaseCheckInfoMapper.getWholeSetDetails(purchaseCheckInfo); + } + /** * 查询新购验收任务列表 * @@ -117,13 +122,13 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public List selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo) { List purchaseCheckInfos = purchaseCheckInfoMapper.selectPurchaseCheckInfoList(purchaseCheckInfo); for (PurchaseCheckInfo checkInfo : purchaseCheckInfos) { - String typeName=""; - List list = purchaseCheckInfoMapper.selectTypeNameAndManageTypeByTaskId(checkInfo.getTaskId()); - if (list.size()>0){ + String typeName = ""; + List list = purchaseCheckInfoMapper.selectTypeNameAndManageTypeByTaskId(checkInfo.getTaskId()); + if (list.size() > 0) { typeName = list.get(0).getPurchasingTypeName(); - if (list.get(0).getManageType().contains("0")){ + if (list.get(0).getManageType().contains("0")) { checkInfo.setManageType("0"); - }else { + } else { checkInfo.setManageType("1"); } } @@ -168,20 +173,22 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { return purchaseCheckInfoMapper.insertPurchaseCheckInfo(purchaseCheckInfo); } - /**采购单号编码生成规则*/ + /** + * 采购单号编码生成规则 + */ private String purchaseCodeRule() { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); String taskNum = taskMapper.selectTaskNumByMonths(nowDate, 23); - if (StringHelper.isNotEmpty(taskNum)){ + if (StringHelper.isNotEmpty(taskNum)) { // 将字符串转换为整数 int num = Integer.parseInt(taskNum); // 执行加一操作 num++; // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 taskNum = String.format("%04d", num); - }else { + } else { taskNum = "0001"; } String code = "XG" + format + "-" + taskNum; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java index b899c8a1..3da71b18 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java @@ -4,12 +4,14 @@ import com.bonus.sgzb.base.api.domain.SltAgreementApply; import com.bonus.sgzb.base.api.domain.SltAgreementInfo; import com.bonus.sgzb.base.api.domain.SltAgreementRelation; import com.bonus.sgzb.base.api.domain.SltInfoVo; + import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.AgreementInfo; import com.bonus.sgzb.material.domain.TmTask; + import com.bonus.sgzb.material.mapper.SltAgreementInfoMapper; import com.bonus.sgzb.material.service.SltAgreementInfoService; import com.bonus.sgzb.material.vo.GlobalContants; diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index 8fde59f5..5e400e16 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9302 + port: 29302 # Spring spring: @@ -21,11 +21,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index bdbed675..e097c7a1 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -309,4 +309,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) t GROUP BY task_id + \ No newline at end of file diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml index d67b9907..8572b87b 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9201 + port: 29201 # Spring spring: @@ -25,11 +25,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 127.0.0.1:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml diff --git a/sgzb-ui/src/views/claimAndRefund/return/apply.json b/sgzb-ui/src/views/claimAndRefund/return/apply.json deleted file mode 100644 index ebbf78cc..00000000 --- a/sgzb-ui/src/views/claimAndRefund/return/apply.json +++ /dev/null @@ -1,143 +0,0 @@ -/** 退料ID */ -@ApiModelProperty(value = "退料ID") -private Long id; - -/** 退料ID-字符串 */ -@ApiModelProperty(value = "退料ID-字符串") -private String ids; - -/** 退料单号 */ -@Excel(name = "退料单号") -@ApiModelProperty(value = "退料单号") -private String code; - -/** 任务ID */ -@ApiModelProperty(value = "任务ID") -private Integer taskId; - -/** 任务ID */ -@ApiModelProperty(value = "任务类型") -private Integer taskType; - -/** 签订日期 */ -@ApiModelProperty(value = "签订日期") -private String signTime; - -/** 退料人员 */ -@Excel(name = "退料人员") -@ApiModelProperty(value = "退料人员") -private String backPerson; - -/** 联系电话 */ -@Excel(name = "退料人联系电话") -@ApiModelProperty(value = "联系电话") -private String phone; - -/** 机具公司审核人 */ -@ApiModelProperty(value = "机具公司审核人") -private Integer directAuditBy; - -/** 机具公司审批时间 */ -@ApiModelProperty(value = "机具公司审批时间") -private String directAuditTime; - -/** 机具公司审批备注 */ -@ApiModelProperty(value = "机具公司审批备注") -private String directAuditRemark; - - -/** 创建者 */ -@ApiModelProperty(value = "创建者") -private String createBy; - -/** 创建时间 */ -@ApiModelProperty(value = "创建时间") -private Date createTime; - -/** 更新者 */ -@ApiModelProperty(value = "更新者") -private String updateBy; - -/** 更新时间 */ -@ApiModelProperty(value = "更新时间") -private Date updateTime; - -/** 备注 */ -@ApiModelProperty(value = "备注") -private String remark; - -/** 数据所属组织 */ -@ApiModelProperty(value = "数据所属组织") -private Long companyId; - -@ApiModelProperty(value = "关键字") -private String keyWord; - -@ApiModelProperty(value = "工程id") -private Integer lotId; - -@Excel(name = "退料工程名称") -@ApiModelProperty(value = "工程名称") -private String lotName; - -@ApiModelProperty(value = "单位id") -private Integer unitId; - -@Excel(name = "退料单位名称") -@ApiModelProperty(value = "单位名称") -private String unitName; - -@Excel(name = "退料申请时间") -@ApiModelProperty(value = "退料日期") -private String backTime; - -@Excel(name = "协议号") -@ApiModelProperty(value = "协议编号") -private String agreementCode; - -@Excel(name = "退料状态") -@ApiModelProperty(value = "任务状态") -private String taskStatus; - -@ApiModelProperty(value = "协议id") -private Integer agreementId; - -@ApiModelProperty(value = "类型id") -private String typeId; - -@Excel(name = "退料工机具类型") -@ApiModelProperty(value = "类型名称") -private String typeName; - -@ApiModelProperty(value = "规格编号") -private String typeCode; - -@ApiModelProperty(value = "数量") -private String num; - -@ApiModelProperty(value = "详情id和数量") -private String detailsIdByNum; - -@ApiModelProperty(value = "类型id和数量") -private String typeIdByNum; - -@ApiModelProperty(value = "详情id") -private String detailsId; - -@ApiModelProperty(value = "编码") -private String maCode; - -@ApiModelProperty(value = "在用数量") -private String useNum; - -@ApiModelProperty(value = "操作人") -private String createName; - -@ApiModelProperty(value = "审核人") -private String examineName; - -@ApiModelProperty(value = "开始时间") -private String startTime; - -@ApiModelProperty(value = "结束时间") -private String endTime; \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue index 135bc7ed..309ebc4d 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue @@ -401,7 +401,7 @@ - +