bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2026-02-03 14:23:36 +08:00
parent 9409488c5a
commit fab9e03421
11 changed files with 84 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
View File

@ -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";
}

4
bonus-common-biz/src/main/java/com/bonus/common/biz/utils/AutomaticHttpHelper.java
View File

@ -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";

11
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecord.java
View File

@ -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;
}

15
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/LeaseOutInfo.java
View File

@ -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;
}

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -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("立体仓出库单创建失败");

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
View File

@ -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("立体仓出库单创建失败");

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java
View File

@ -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(), "立体仓入库单创建失败");

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
View File

@ -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(), "立体仓入库单创建失败");

28
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml
View File

@ -216,6 +216,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getLeaseOutList" resultType="com.bonus.material.basic.domain.report.LeaseOutInfo">
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,
@ -232,7 +234,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.manage_type as manageType,
mtm.user_id as userId,
lad.parent_id as parentId,
lad.type_id as typeId
lad.type_id as typeId,
mt.jiju_type as jijuType
from
lease_apply_details lad
LEFT JOIN lease_apply_info lai ON lad.parent_id = lai.id
@ -277,9 +280,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}))
)
</if>
<if test="constructionTypes != null and constructionTypes.length > 0">
and mt3.type_id in
<foreach item="item" index="index" collection="constructionTypes" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE_FORMAT( COALESCE(lai.release_time, lai.create_time), '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
</if>
<if test="jijuType != null and jijuType != '' ">
and mt.jiju_type = #{jijuType}
</if>
GROUP BY
lad.parent_id,
lad.type_id
@ -288,6 +300,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPublishList" resultType="com.bonus.material.basic.domain.report.LeaseOutInfo">
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}))
)
</if>
<if test="constructionTypes != null and constructionTypes.length > 0">
and mt3.type_id in
<foreach item="item" index="index" collection="constructionTypes" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[ AND DATE_FORMAT( lpd.create_time , '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
</if>
<if test="jijuType != null and jijuType != '' ">
and mt.jiju_type = #{jijuType}
</if>
</where>
GROUP BY
lpd.publish_task,

8
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
View File

@ -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}, '%')
)
</if>
<if test="constructionTypes != null and constructionTypes.length > 0">
and mt4.type_id in
<foreach item="item" index="index" collection="constructionTypes" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="isFinish != null and isFinish == 1">
AND bp.actual_end_date is not null
</if>

11
bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
View File

@ -1694,6 +1694,17 @@
<if test="isFinish != null and isFinish == 0">
AND bp.actual_end_date is null
</if>
<if test="keyWord != null and keyWord != ''">
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},'%')
)
</if>
</where>
) res