Merge branch 'dev_20260429' into dev_WMS20260401

# 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

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java

@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  * bms财务结算系统feign调用接口
  */
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE,url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface BmsServiceFeign {
 
 

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java

@@ -8,6 +8,7 @@ import com.mhd.system.api.factory.RemoteOmsFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -39,4 +40,13 @@ public interface OmsServiceFeign {
     @ApiOperation("库存调整记录插入")
     @PostMapping("/reservationInventoryAdjustmentRecordApi/edit")
     AjaxResult inventoryAdjustmentRecordInsert(InventoryAdjustmentRecord inventoryAdjustmentRecord);
+
+    @ApiOperation("查询企业单位列表-新增物料时显示下拉框数据")
+    @GetMapping("/erpEnterpriseUnitApi/unitList")
+    public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO);
+
+    //查询企业国别列表-新增物料时显示下拉框数据
+    @ApiOperation("查询企业国别列表-新增物料时显示下拉框数据")
+    @GetMapping("/erpCountryApi/countryList")
+    public AjaxResult getCountryList(ErpCountryDTO erpCountryDTO);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java

@@ -363,6 +363,9 @@ public interface SystemServiceFeign {
     @GetMapping("/contractManageApi/getInfoByCustomer2")
     public AjaxResult getInfoByCustomer2(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType,@RequestParam("topOrganizationId") Long topOrganizationId);
 
+    @GetMapping("/contractManageApi/getInfoByCustomerAndOrganizationId")
+    public AjaxResult getInfoByCustomerAndOrganizationId(@RequestParam("settlementCustomersCode") String settlementCustomersCode,@RequestParam("contractType") Integer contractType,@RequestParam("topOrganizationId") Long topOrganizationId,@RequestParam("organizationId") Long organizationId);
+
     @GetMapping("/contractManageApi/queryList")
     public AjaxResult queryList();
 
@@ -377,4 +380,4 @@ public interface SystemServiceFeign {
     public AjaxResult matchForMaterialImport(@RequestParam("keyword") String keyword,
                                             @RequestParam("organizationId") Long organizationId);
 
-}
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java

@@ -9,15 +9,19 @@ import com.mhd.common.core.domain.dto.UserDriverDTO;
 import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.domain.todo.StatisticalMattersDo;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.domain.UserDTO;
+import com.mhd.system.api.domain.UserShipperQueryDTO;
 import com.mhd.system.api.domain.UserUpdateDTO;
 import com.mhd.system.api.factory.RemoteUserFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import com.mhd.system.api.model.LoginUser;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -195,4 +199,19 @@ public interface UserServiceFeign {
     @ApiOperation("设置路线")
     @PostMapping("/userApi/updateLineManagement")
     public AjaxResult updateLineManagement(@RequestBody UserDTO userDTO);
+
+
+
+
+    @ApiOperation("商业合作伙伴-分页查询托运人列表")
+    @GetMapping("/userShipperApi/userShipperList")
+    public TableDataInfo userShipperList(@SpringQueryMap UserShipperQueryDTO userShipperQueryDTO);
+
+
+    @PostMapping("/userShipperApi/updatePushStatus")
+    public AjaxResult<?> updatePushStatus(@RequestParam(value = "shipperId") Long shipperId,
+                          @RequestParam(value = "pushStatus", required = false) Integer pushStatus,
+                          @RequestParam(value = "pushTime", required = false) String pushTime,
+                          @RequestParam(value = "pushBy", required = false) Long pushBy,
+                          @RequestParam(value = "pushByName", required = false) String pushByName);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java

@@ -538,4 +538,19 @@ public interface WlhyServiceFeign {
 
     @GetMapping("/feign/order/cancelIssueDocuments")
     public AjaxResult cancelIssueDocuments(@RequestParam(name="executeOrderId") String executeOrderId);
+
+    @GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryList")
+    public AjaxResult<?> queryList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                               @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                               @RequestParam(name="pushStatus", required = false) String pushStatus,
+                                               @RequestParam(name="organizationId", required = false) String organizationId);
+
+
+    @ApiOperation("汇率-更新推送状态")
+    @PostMapping("/ntocc/tmsSettlementExchangeRate/updatePushStatus")
+    void updateExchangeRatePushStatus(@RequestParam("id") String id,
+                                      @RequestParam("pushStatus") Integer pushStatus,
+                                      @RequestParam(name="pushTime",required = false) String pushTime,
+                                      @RequestParam(name="pushBy",required = false) Long pushBy,
+                                      @RequestParam(name="pushByName",required = false) String pushByName);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java

@@ -2,6 +2,7 @@ package com.mhd.system.api;
 
 import com.mhd.common.core.constant.ServiceNameConstants;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.domain.*;
 import com.mhd.system.api.factory.RemoteWmsFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
@@ -95,4 +96,16 @@ public interface WmsServiceFeign {
     @ApiOperation("oms下发单明细保存")
     @PostMapping(value = "/stockInOrderApi/omsInOrderAddDetail")
     public void omsInOrderAddDetail(@RequestBody List<InMaterialDetail> inMaterialDetails);
+
+    @ApiOperation("oms查询物料列表")
+    @GetMapping("/materialBaseInfoApi/queryList")
+    public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO);
+
+    @ApiOperation("oms物料列表推送-更新推送信息")
+    @PostMapping("/materialBaseInfoApi/updatePushStatus")
+    public AjaxResult<?> updateMaterialPushStatus(@RequestParam("materialBaseInfoId") Long materialBaseInfoId,
+                                  @RequestParam("pushStatus") Integer pushStatus,
+                                  @RequestParam(value = "pushTime",required = false) String pushTime,
+                                  @RequestParam(value = "pushBy",required = false) Long pushBy,
+                                  @RequestParam(value = "pushByName",required = false) String pushByName);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpCountryDTO.java

@@ -0,0 +1,24 @@
+package com.mhd.system.api.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "企业国别DTO")
+public class ErpCountryDTO {
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("ERP国别编码")
+    private String erpCountryCode;
+
+    @ApiModelProperty("ERP国别名称")
+    private String erpCountryName;
+
+    @ApiModelProperty("所属组织ID")
+    private Long organizationId;
+
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ErpEnterpriseUnitDTO.java

@@ -0,0 +1,22 @@
+package com.mhd.system.api.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "企业单位DTO")
+public class ErpEnterpriseUnitDTO {
+
+    @ApiModelProperty("企业单位id")
+    private Long id;
+
+    @ApiModelProperty("企业单位名称")
+    private String erpName;
+
+    @ApiModelProperty("企业单位编码")
+    private String erpCode;
+
+    @ApiModelProperty("组织ID")
+    private Long organizationId;
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java

@@ -207,6 +207,14 @@ public class MaterialBaseInfoFeign 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;
+
     /**
      * 规格型号
      */

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInfoDTO.java

@@ -0,0 +1,57 @@
+package com.mhd.system.api.domain;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+
+@Data
+@ApiModel(description = "物料信息查询DTO")
+public class MaterialInfoDTO {
+
+    @ApiModelProperty("物料id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料id")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    private String materialName;
+
+    @ApiModelProperty("货物类型 0-料件 1-半成品 2-成品")
+    private Integer goodsType;
+
+    @ApiModelProperty("组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty("创建时间起")
+    private String createTimeStart;
+
+    @ApiModelProperty("创建时间止")
+    private String createTimeEnd;
+
+    @ApiModelProperty("更新时间起")
+    private String updateTimeStart;
+
+    @ApiModelProperty("更新时间止")
+    private String updateTimeEnd;
+
+    @ApiModelProperty("推送状态")
+    private Integer pushStatus;
+
+    @ApiModelProperty("推送时间起")
+    private String pushTimeStart;
+
+    @ApiModelProperty("推送时间止")
+    private String pushTimeEnd;
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum = 1;
+
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = 10;
+
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/SysDictType.java

@@ -34,6 +34,45 @@ public class SysDictType extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
+    /** 组织表ID */
+    private Long organizationId;
+
+    /** 组织名称 */
+    private String organizationName;
+
+    /** 一级组织表ID */
+    private Long topOrganizationId;
+
+    public Long getOrganizationId()
+    {
+        return organizationId;
+    }
+
+    public void setOrganizationId(Long organizationId)
+    {
+        this.organizationId = organizationId;
+    }
+
+    public String getOrganizationName()
+    {
+        return organizationName;
+    }
+
+    public void setOrganizationName(String organizationName)
+    {
+        this.organizationName = organizationName;
+    }
+
+    public Long getTopOrganizationId()
+    {
+        return topOrganizationId;
+    }
+
+    public void setTopOrganizationId(Long topOrganizationId)
+    {
+        this.topOrganizationId = topOrganizationId;
+    }
+
     public Long getDictId()
     {
         return dictId;
@@ -86,6 +125,9 @@ public class SysDictType extends BaseEntity
             .append("dictName", getDictName())
             .append("dictType", getDictType())
             .append("status", getStatus())
+            .append("organizationId", getOrganizationId())
+            .append("organizationName", getOrganizationName())
+            .append("topOrganizationId", getTopOrganizationId())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserShipperQueryDTO.java

@@ -0,0 +1,52 @@
+package com.mhd.system.api.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class UserShipperQueryDTO {
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum = 1;
+
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(value = "登录账号")
+    private String userAccount;
+
+    @ApiModelProperty(value = "企业名称")
+    private String shipperEnterpriseName;
+
+    @ApiModelProperty(value = "组织ID")
+    private String organizationId;
+
+    @ApiModelProperty(value = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty(value = "创建时间起")
+    private String createTimeFrom;
+
+    @ApiModelProperty(value = "创建时间止")
+    private String createTimeTo;
+
+    @ApiModelProperty(value = "更新时间起")
+    private String updateTimeFrom;
+
+    @ApiModelProperty(value = "更新时间止")
+    private String updateTimeTo;
+
+    @ApiModelProperty(value = "货主类型")
+    private String shipperType;
+
+    @ApiModelProperty(value = "推送状态")
+    private Integer pushStatus;
+
+    @ApiModelProperty(value = "推送时间起")
+    private String pushTimeFrom;
+
+    @ApiModelProperty(value = "推送时间止")
+    private String pushTimeTo;
+
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java

@@ -58,6 +58,16 @@ public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsService
             public AjaxResult inventoryAdjustmentRecordInsert(InventoryAdjustmentRecord inventoryAdjustmentRecord) {
                 return null;
             }
+
+            @Override
+            public AjaxResult getUnitList(ErpEnterpriseUnitDTO erpEnterpriseUnitDTO) {
+                return null;
+            }
+
+            @Override
+            public AjaxResult getCountryList(ErpCountryDTO erpCountryDTO) {
+                return null;
+            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java

@@ -289,6 +289,11 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
                 return AjaxResult.error("查询失败");
             }
 
+            @Override
+            public AjaxResult getInfoByCustomerAndOrganizationId(String settlementCustomersCode, Integer contractType, Long topOrganizationId, Long organizationId) {
+                return null;
+            }
+
             @Override
             public AjaxResult queryList() {
                 return AjaxResult.error("查询失败");

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java

@@ -5,8 +5,10 @@ import com.mhd.common.core.domain.dto.StatisticalMattersDTO;
 import com.mhd.common.core.domain.dto.UserDataPermissionQueryDTO;
 import com.mhd.common.core.domain.dto.UserDriverDTO;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.UserServiceFeign;
 import com.mhd.system.api.domain.UserDTO;
+import com.mhd.system.api.domain.UserShipperQueryDTO;
 import com.mhd.system.api.domain.UserUpdateDTO;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.common.core.domain.entity.R;
@@ -19,6 +21,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -186,6 +190,22 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
             public AjaxResult updateLineManagement(UserDTO userDTO) {
                 return  AjaxResult.error("失败" + throwable.getMessage());
             }
+
+            @Override
+            public TableDataInfo userShipperList(UserShipperQueryDTO userShipperQueryDTO) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setData(new ArrayList<>());
+                tableDataInfo.setTotal(0);
+                tableDataInfo.setCode(500);
+                tableDataInfo.setMsg("查询失败:" + throwable.getMessage());
+                return tableDataInfo;
+            }
+
+
+            @Override
+            public AjaxResult<?> updatePushStatus(Long shipperId, Integer pushStatus, String pushTime, Long pushBy, String pushByName) {
+                return  AjaxResult.error("更新失败" + throwable.getMessage());
+            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java

@@ -550,6 +550,16 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
             public AjaxResult cancelIssueDocuments(String executeOrderId) {
                 return AjaxResult.error(cause.getMessage());
             }
+
+            @Override
+            public AjaxResult<?> queryList(Integer pageNo, Integer pageSize, String pushStatus, String organizationId) {
+                return AjaxResult.error(cause.getMessage());
+            }
+
+            @Override
+            public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName) {
+
+            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java

@@ -2,6 +2,7 @@ package com.mhd.system.api.factory;
 
 import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.WlhyServiceFeign;
 import com.mhd.system.api.WmsServiceFeign;
 import com.mhd.system.api.domain.*;
@@ -11,6 +12,7 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -69,6 +71,20 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             @Override
             public void omsInOrderAddDetail(List<InMaterialDetail> inMaterialDetails) {
             }
+
+            @Override
+            public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO) {
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setData(new ArrayList<>());
+                tableDataInfo.setTotal(0);
+                tableDataInfo.setCode(500);
+                return tableDataInfo;
+            }
+
+            @Override
+            public AjaxResult<?> updateMaterialPushStatus(Long materialBaseInfoId, Integer pushStatus, String pushTime, Long pushBy, String pushByName) {
+                return AjaxResult.error(cause.getMessage());
+            }
         };
     }
 }