weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20260429' into dev_WMS20260401

Browse Source 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
This commit is contained in:
王奎兴
2026-05-15 13:55:42 +08:00
parent 226ded3ee9 20e47e8cc4
commit 206c85aaf7
162 changed files with 7447 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/associationWarehouse/repository/persistence/AssociationWarehouseImpl.java
+25 -8
View File
@@ -107,7 +107,31 @@ public class AssociationWarehouseImpl extends ServiceImpl<AssociationWarehouseMa
associationWarehouseDO.setWarehouseId(associationWarehouseDO.getWarehouseIdIdList().get(0));
//设置仓库信息
warehouseParam(associationWarehouseDO);
for (Long correlationId : associationWarehouseDO.getCorrelationIdList()){
// 先删该仓下「非默认仓」绑定，再批量插入本次提交的用户；保留 is_default=2（如新建仓自动写入的创建人默认仓），避免前端列表不展示该条却全量保存时被误删
remove(new QueryWrapper<AssociationWarehouse>().lambda()
.eq(AssociationWarehouse::getWarehouseId, associationWarehouseDO.getWarehouseId())
.eq(AssociationWarehouse::getDelFlag, 1)
.and(w -> w.isNull(AssociationWarehouse::getIsDefault)
.or()
.ne(AssociationWarehouse::getIsDefault, 2)));
List<AssociationWarehouse> stillBoundRows = associationWarehouseMapper.selectList(new QueryWrapper<AssociationWarehouse>().lambda()
.eq(AssociationWarehouse::getWarehouseId, associationWarehouseDO.getWarehouseId())
.eq(AssociationWarehouse::getDelFlag, 1));
Set<Long> alreadyBoundCorrelationIds = stillBoundRows.stream()
.map(AssociationWarehouse::getCorrelationId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
LinkedHashSet<Long> distinctCorrelationIds = CollectionUtils.isEmpty(associationWarehouseDO.getCorrelationIdList())
? new LinkedHashSet<>()
: new LinkedHashSet<>(associationWarehouseDO.getCorrelationIdList());
for (Long correlationId : distinctCorrelationIds) {
if (correlationId == null) {
continue;
}
// 仍在库内的绑定（多为创建人默认仓 is_default=2）不再插入，否则撞唯一 IDX_ASS_COR_WAR_ID
if (alreadyBoundCorrelationIds.contains(correlationId)) {
continue;
}
AssociationWarehouse associationWarehouse = new AssociationWarehouse();
associationWarehouse.setOrganizationId(loginUser.getUserPo().getOrganizationId());
associationWarehouse.setOrganizationName(loginUser.getUserPo().getOrganizationName());
@@ -121,13 +145,6 @@ public class AssociationWarehouseImpl extends ServiceImpl<AssociationWarehouseMa
associationWarehouse.setCreateTime(new Date());
associationWarehouseList.add(associationWarehouse);
}
// 先删该仓下「非默认仓」绑定，再批量插入本次提交的用户；保留 is_default=2（如新建仓自动写入的创建人默认仓），避免前端列表不展示该条却全量保存时被误删
remove(new QueryWrapper<AssociationWarehouse>().lambda()
.eq(AssociationWarehouse::getWarehouseId, associationWarehouseDO.getWarehouseId())
.eq(AssociationWarehouse::getDelFlag, 1)
.and(w -> w.isNull(AssociationWarehouse::getIsDefault)
.or()
.ne(AssociationWarehouse::getIsDefault, 2)));
}
return saveBatch(associationWarehouseList);
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
+1 -1
View File
@@ -75,4 +75,4 @@ public class BatchDetailDomainService {
batchDetailDO.setBatchId(batchId);
return batchDetailService.queryList(batchDetailDO);
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/entity/ExpenseAccount.java
+22
View File
@@ -1,6 +1,7 @@
package com.mhd.basic.domain.expenseAccount.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.mhd.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
@@ -113,4 +114,25 @@ public class ExpenseAccount extends BaseVOEntity{
@ApiModelProperty("费率")
private BigDecimal rate;
@ApiModelProperty("计费单位")
private String billingUnit;
@ApiModelProperty("计费单位英文")
private String billingUnitEn;
@ApiModelProperty("计费单位2")
private String billingUnit2;
@ApiModelProperty("计费单位2英文")
private String billingUnitEn2;
@ApiModelProperty("计费单位中文默认")
private String billingUnitDefaultCn;
@ApiModelProperty("计费单位英文默认")
private String billingUnitDefaultEn;
@ApiModelProperty("nc科目编码")
private String ncSubjectCode;
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/po/ExpenseAccountPO.java
+23
View File
@@ -1,5 +1,6 @@
package com.mhd.basic.domain.expenseAccount.repository.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.mhd.common.core.annotation.Excel;
import lombok.Data;
import java.util.Date;
@@ -136,4 +137,26 @@ public class ExpenseAccountPO extends BaseVOEntity{
@ApiModelProperty(name = "出库单是否固定显示 0-否 1-是")
private Integer outOrderDisplay;
@ApiModelProperty("计费单位")
private String billingUnit;
@ApiModelProperty("计费单位英文")
private String billingUnitEn;
@ApiModelProperty("计费单位2")
private String billingUnit2;
@ApiModelProperty("计费单位2英文")
private String billingUnitEn2;
@ApiModelProperty("计费单位中文默认")
private String billingUnitDefaultCn;
@ApiModelProperty("计费单位英文默认")
private String billingUnitDefaultEn;
@ApiModelProperty("nc科目编码")
private String ncSubjectCode;
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java
+28
View File
@@ -153,4 +153,32 @@ public class ExpenseAccountDO extends BaseVOEntity{
@ApiModelProperty(name = "创建者姓名")
private String updateByName;
@ApiModelProperty("计费单位")
private String billingUnit;
@ApiModelProperty("计费单位英文")
private String billingUnitEn;
@ApiModelProperty("计费单位2")
private String billingUnit2;
@ApiModelProperty("计费单位2英文")
private String billingUnitEn2;
@ApiModelProperty("计费单位中文默认")
private String billingUnitDefaultCn;
@ApiModelProperty("计费单位英文默认")
private String billingUnitDefaultEn;
@ApiModelProperty("nc科目编码")
private String ncSubjectCode;
/** 查询参数：是否按仓储合同结算设置拉取科目 */
private Boolean contractSettlementQuery;
/** 查询参数：结算主体编码（货主编码等） */
private String settlementCustomersCode;
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java
+9
View File
@@ -389,4 +389,13 @@ public class MaterialBaseInfo extends BaseVOEntity{
@ApiModelProperty("是否抄码: 1-是 2-否")
@Excel(name = "是否抄码: 1-是 2-否")
private Integer copyCode;
@ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
@Excel(name = "货物类型:0-物料 1-半成品 2-成品")
private Integer goodsType;
@ApiModelProperty("毛重（kg）")
@Excel(name = "毛重（kg）")
private BigDecimal grossWeight;
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java
+8
View File
@@ -365,6 +365,14 @@ public class MaterialBaseInfoPO extends BaseVOEntity{
@Excel(name = "是否抄码: 1-是 2-否")
private Integer copyCode;
@ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
@Excel(name = "货物类型:0-物料 1-半成品 2-成品")
private Integer goodsType;
@ApiModelProperty("毛重（kg）")
@Excel(name = "毛重（kg）")
private BigDecimal grossWeight;
@ApiModelProperty("商品规则")
private MaterialGoodsRuleFeign materialGoodsRule;
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java
+8
View File
@@ -385,4 +385,12 @@ public class MaterialBaseInfoDO extends BaseVOEntity{
@ApiModelProperty("是否抄码: 1-是 2-否")
@Excel(name = "是否抄码: 1-是 2-否")
private Integer copyCode;
@ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
@Excel(name = "货物类型:0-物料 1-半成品 2-成品")
private Integer goodsType;
@ApiModelProperty("毛重（kg）")
@Excel(name = "毛重（kg）")
private BigDecimal grossWeight;
}