From 76af0c8d07a29902bb261c4f3dca39e08c1f940b Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Wed, 14 Jan 2026 17:47:19 +0800 Subject: [PATCH] =?UTF-8?q?JSK=20=20=E6=96=B0=E8=B4=AD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/ma/domain/MachIneDto.java | 1 + .../material/ma/service/impl/MachineServiceImpl.java | 10 ++++++++++ .../purchase/service/impl/PurchaseBindServiceImpl.java | 2 ++ .../mapper/material/back/BackApplyInfoMapper.xml | 4 ++-- .../mapper/material/lease/LeaseApplyInfoMapper.xml | 4 ++-- .../mapper/material/purchase/PurchaseStorageMapper.xml | 2 ++ 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MachIneDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MachIneDto.java index 5ffe5ffc..60c195c6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MachIneDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MachIneDto.java @@ -155,4 +155,5 @@ public class MachIneDto { @ApiModelProperty(value = "表单集合入库数量") private BigDecimal putInStoreNum; + private Long companyId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java index a9b4f8a0..f0232e26 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java @@ -621,6 +621,11 @@ public class MachineServiceImpl implements IMachineService } machine.setMaStatus("1"); machine.setMaVender(machine.getSupplierId()); + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + machine.setCompanyId(companyId+""); int result = machineMapper.insertMachine(machine); if (result > 0) { return AjaxResult.success("入库成功"); @@ -705,6 +710,11 @@ public class MachineServiceImpl implements IMachineService machine.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getUserId()+""); if ("1".equals(machine.getType()) || "2".equals(machine.getType())){ //新增设备编码 + /** + * jsk + */ + Long companyId=iTypeService.getUserDeptId(); + machine.setCompanyId(companyId+""); res = machineMapper.insertMachine(machine); if (res<=0){ throw new RuntimeException("添加设备失败"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 3420cf00..4e514761 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -214,6 +214,8 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { purchaseDto.setProductDate(details.get(0).getProductionTime()); } } + Long companyId=iTypeService.getUserDeptId(); + purchaseDto.setCompanyId(companyId); if (1 != purchaseStorageMapper.insertMachine(purchaseDto)) { return AjaxResult.error(1116,"插入maMachine时SQL执行失败!"); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 398f062a..cbb52a06 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -1973,7 +1973,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bcd.back_num as backNum, bcd.create_time as inTime, bc.print_status, - mt.jiju_type AS jijuType + case when mt.jiju_type='1' then '机具' else '安全工器具' end AS jijuType FROM back_check_details bcd LEFT JOIN back_apply_info bc on bcd.parent_id = bc.id @@ -1998,7 +1998,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.pro_name like concat('%', #{proName} ,'%') - and ( bp2.pro_name like concat('%', #{keyWord} ,'%') + and ( bp.pro_name like concat('%', #{keyWord} ,'%') or sd.dept_name like concat('%', #{keyWord} ,'%') or mt2.type_name like concat('%', #{keyWord} ,'%') or mt.type_name like concat('%', #{keyWord} ,'%')) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 52c60e25..4020da14 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -1357,7 +1357,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lod.out_num as outnum, mm.ma_code as macode, lod.create_time as outTime, - mt.jiju_type as jijutype, + case when mt.jiju_type='1' then '机具' else '安全工器具' end as jijutype, lai.`code` as code, lai.lease_person as leaseperson, lod.publish_task as publishtask, @@ -1410,7 +1410,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lod.out_num as outnum, mm.ma_code as macode, lod.create_time as outTime, - mt.jiju_type as jijutype, + case when mt.jiju_type='1' then '机具' else '安全工器具' end as jijutype, lpd.`code` as code, lpd.lease_person as leaseperson, lod.publish_task as publishtask, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml index 4619621e..3898d264 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml @@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" out_fac_code, buy_task, ma_vender, + company_id, create_time @@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{outFacCode}, #{taskId}, #{supplier}, + #{companyId}, now()