From fab9e034212d770ba0e5e57746d6d87869e77cf2 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 3 Feb 2026 14:23:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/constant/MaterialConstants.java | 6 ++-- .../common/biz/utils/AutomaticHttpHelper.java | 4 +-- .../basic/domain/ProjUsingRecord.java | 11 ++++++++ .../basic/domain/report/LeaseOutInfo.java | 15 ++++++++++ .../impl/LeaseApplyInfoServiceImpl.java | 4 +-- .../service/impl/LeaseTaskServiceImpl.java | 4 +-- .../impl/PurchaseStorageServiceImpl.java | 4 +-- .../impl/RepairInputDetailsServiceImpl.java | 4 +-- .../mapper/material/basic/BmReportMapper.xml | 28 +++++++++++++++++-- .../material/basic/ComplexQueryMapper.xml | 8 ++++++ .../settlement/SltAgreementInfoMapper.xml | 11 ++++++++ 11 files changed, 84 insertions(+), 15 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java index bca1cfeb..b233a3c3 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java @@ -138,7 +138,7 @@ public class MaterialConstants { /** * 立体库生产环境获取token路径 */ - public static final String PROD_TOKEN_URL = "http://172.26.213.95:32400/api/Identity/login/getToken"; + public static final String PROD_TOKEN_URL = "http://10.145.2.207:32400/api/Identity/login/getToken"; /** * 立体库测试环境建立出库单路径 @@ -148,7 +148,7 @@ public class MaterialConstants { /** * 立体库生产环境建立出库单路径 */ - public static final String PROD_CREATE_OUT_URL = "http://172.26.213.95:32400/api/lims/zNXT/docOutStorage"; + public static final String PROD_CREATE_OUT_URL = "http://10.145.2.207:32400/api/lims/zNXT/docOutStorage"; /** * 立体库测试环境建立入库单路径 @@ -158,5 +158,5 @@ public class MaterialConstants { /** * 立体库生产环境建立入库单路径 */ - public static final String PROD_CREATE_IN_URL = "http://172.26.213.95:32400/api/lims/zNXT/docInStorage"; + public static final String PROD_CREATE_IN_URL = "http://10.145.2.207:32400/api/lims/zNXT/docInStorage"; } diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/AutomaticHttpHelper.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/AutomaticHttpHelper.java index 35ae8886..d1de641b 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/AutomaticHttpHelper.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/AutomaticHttpHelper.java @@ -187,9 +187,9 @@ public class AutomaticHttpHelper { */ private static String getToken() { // 立体库本地测试token路径 - String tokenUrl = MaterialConstants.TEST_TOKEN_URL; + //String tokenUrl = MaterialConstants.TEST_TOKEN_URL; // 立体库生产环境token路径 - //String tokenUrl = MaterialConstants.PROD_TOKEN_URL; + String tokenUrl = MaterialConstants.PROD_TOKEN_URL; try { String userName = "ZNXT"; String password = "123456"; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java index cf716eb0..d3115991 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java @@ -51,6 +51,14 @@ public class ProjUsingRecord { //@Excel(name = "合同主体") private String contractPart; + @ApiModelProperty(value = "施工类型") + @Excel(name = "施工类型") + private String constructionType; + + @ApiModelProperty(value = "物资类型") + @Excel(name = "物资类型") + private String materialType; + @ApiModelProperty(value = "物资名称") @Excel(name = "物资名称") private String typeName; @@ -158,4 +166,7 @@ public class ProjUsingRecord { @ApiModelProperty("是否班组 0是，1否") @Excel(name = "是否班组", readConverterExp = "0=是,1=否") private String isTeam; + + @ApiModelProperty(value = "施工类型ids") + private String[] constructionTypes; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java index 06bc8195..0e5c596a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java @@ -26,6 +26,14 @@ public class LeaseOutInfo { @ApiModelProperty(value = "物资类型id") private Long typeId; + @ApiModelProperty(value = "施工类型") + @Excel(name = "施工类型") + private String constructionType; + + @ApiModelProperty(value = "物资类型") + @Excel(name = "物资类型") + private String materialType; + @ApiModelProperty(value = "物资名称") @Excel(name = "物资名称") private String typeName; @@ -80,6 +88,10 @@ public class LeaseOutInfo { @Excel(name = "领料单号") private String code; + @ApiModelProperty("机具类型（1施工机具，2安全工器具）") + @Excel(name = "机具类型", readConverterExp = "1=施工机具,2=安全工器具") + private String jijuType; + @ApiModelProperty(value = "管理方式") private String manageType; @@ -101,4 +113,7 @@ public class LeaseOutInfo { private String leaseUnitId; private String leaseProjectId; private String impUnitName; + + @ApiModelProperty(value = "施工类型ids") + private String[] constructionTypes; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index e2e10601..df2e4b86 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -1638,9 +1638,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { map.put("DtlList", list); String body = JSONObject.toJSONString(map); // 立体库本地建立出库单接口路径 - String url = MaterialConstants.TEST_CREATE_OUT_URL; - // 立体库生产建立出库单接口路径 //String url = MaterialConstants.TEST_CREATE_OUT_URL; + // 立体库生产建立出库单接口路径 + String url = MaterialConstants.PROD_CREATE_OUT_URL; String data = AutomaticHttpHelper.sendHttpPostPushCost(url, body); if (StringUtils.isEmpty(data)) { System.err.println("立体仓出库单创建失败"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 29dcd2d9..ad97782a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -1219,9 +1219,9 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { map.put("DtlList", list); String body = JSONObject.toJSONString(map); // 立体库本地建立出库单接口路径 - String url = MaterialConstants.TEST_CREATE_OUT_URL; - // 立体库生产建立出库单接口路径 //String url = MaterialConstants.TEST_CREATE_OUT_URL; + // 立体库生产建立出库单接口路径 + String url = MaterialConstants.PROD_CREATE_OUT_URL; String data = AutomaticHttpHelper.sendHttpPostPushCost(url, body); if (StringUtils.isEmpty(data)) { throw new RuntimeException("立体仓出库单创建失败"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java index aac0e6b4..366d9910 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java @@ -275,9 +275,9 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { map.put("DtlList", list); String body = JSONObject.toJSONString(map); // 立体库本地建立入库单接口路径 - String url = MaterialConstants.TEST_CREATE_IN_URL; + //String url = MaterialConstants.TEST_CREATE_IN_URL; // 立体库生产建立入库单接口路径 - //String url = MaterialConstants.PROD_CREATE_IN_URL; + String url = MaterialConstants.PROD_CREATE_IN_URL; String data = AutomaticHttpHelper.sendHttpPostPushCost(url, body); if (StringUtils.isEmpty(data)) { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "立体仓入库单创建失败"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java index 48e731c1..9135ed41 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java @@ -672,9 +672,9 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService map.put("DtlList", list); String body = JSONObject.toJSONString(map); // 立体库本地建立入库单接口路径 - String url = MaterialConstants.TEST_CREATE_IN_URL; + //String url = MaterialConstants.TEST_CREATE_IN_URL; // 立体库生产建立入库单接口路径 - //String url = MaterialConstants.PROD_CREATE_IN_URL; + String url = MaterialConstants.PROD_CREATE_IN_URL; String data = AutomaticHttpHelper.sendHttpPostPushCost(url, body); if (StringUtils.isEmpty(data)) { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "立体仓入库单创建失败"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml index f6a0f43c..b4205a3f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml @@ -216,6 +216,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT + mt3.type_name AS constructionType, + mt2.type_name AS materialType, mt1.type_name AS typeName, mt.type_name AS typeModelName, mt.unit_name AS unitName, @@ -303,7 +317,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.manage_type as manageType, lpd.create_time AS leaseTime, lpd.parent_id as parentId, - lpd.type_id as typeId + lpd.type_id as typeId, + mt.jiju_type as jijuType FROM lease_publish_details lpd LEFT JOIN lease_apply_info lai ON lai.id = lpd.parent_id @@ -348,9 +363,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id=#{impUnitName})) ) + + and mt3.type_id in + + #{item} + + + + and mt.jiju_type = #{jijuType} + GROUP BY lpd.publish_task, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 2b511920..631d961a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -40,6 +40,8 @@ bp.pro_name AS proName, bu.unit_name AS unitName, sd.dept_name AS impUnitName, + mt4.type_name AS constructionType, + mt3.type_name AS materialType, mt2.type_name AS typeName, bp.contract_part AS contractPart, mt.type_name AS typeModelName, @@ -105,6 +107,12 @@ sd.dept_name like concat('%', #{keyWord}, '%') ) + + and mt4.type_id in + + #{item} + + AND bp.actual_end_date is not null diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml index 678bd349..c8b21cbc 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml @@ -1694,6 +1694,17 @@ AND bp.actual_end_date is null + + AND ( + bai.agreement_code like concat('%',#{keyWord},'%') + OR bp.pro_name like concat('%',#{keyWord},'%') + OR mt1.type_name like concat('%',#{keyWord},'%') + OR mt.type_name like concat('%',#{keyWord},'%') + OR mt.unit_name like concat('%',#{keyWord},'%') + OR ifnull(sad.unit_name ,bui.unit_name) like concat('%',#{keyWord},'%') + OR sd.dept_name like concat('%',#{keyWord},'%') + ) + ) res