Merge branch 'wms_dev' into wms_dev_hbbf

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml

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

@@ -275,6 +275,12 @@ public interface SystemServiceFeign {
     @GetMapping("/associationWarehouseApi/setWarehouseInfo")
     public AjaxResult setWarehouseInfo(@RequestBody AssociationWarehouseFeign associationWarehouseFeign);
 
+    /**
+     * 查询仓库关联的用户ID集合
+     */
+    @GetMapping("/associationWarehouseApi/queryListCorrelationId")
+    public AjaxResult queryListCorrelationId(@RequestParam(value = "warehouseId", required = false) Long warehouseId);
+
 
     /**
      * 根据code编码查询费用科目

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

@@ -109,6 +109,13 @@ public interface UserServiceFeign {
     @GetMapping("/userApi/getInfo/{userId}")
     public AjaxResult getInfo(@PathVariable("userId") Long userId);
 
+    /**
+     * 根据用户ID查询用户详细信息
+     */
+    @ApiOperation("根据用户ID查询用户详细信息")
+    @GetMapping("/userApi/getInfoByName/{userName}")
+    public AjaxResult getInfoByName(@PathVariable("userName") String userName);
+
 
     /**
      * 查询车辆绑定的承运人列表
@@ -184,4 +191,4 @@ public interface UserServiceFeign {
     @ApiOperation("根据用户ID查询货主信息")
     @GetMapping("/userShipperApi/getShipperByUserId/{userId}")
     public AjaxResult<?> getShipperByUserId(@PathVariable("userId") Long userId);
-}
+}

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

@@ -3,12 +3,15 @@ package com.mhd.system.api;
 import com.mhd.common.core.constant.ServiceNameConstants;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.domain.MaterialBaseInfoFeign;
+import com.mhd.system.api.domain.MaterialInventoryDTO;
 import com.mhd.system.api.domain.NoticeOrderDTO;
 import com.mhd.system.api.factory.RemoteTicketFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * @author ZhouGY
  * @title WmsServiceFeign
@@ -57,4 +60,9 @@ public interface WmsServiceFeign {
     @PostMapping("/noticeOrderApi/insert")
     public AjaxResult stockOutOrInInsert(@RequestBody NoticeOrderDTO noticeOrderDTO);
 
+    /**
+     * 查询物料库存列表不分页
+     */
+    @GetMapping("/materialInventoryApi/listAll")
+    public AjaxResult materialInventoryApiListAll(MaterialInventoryDTO materialInventoryDTO);
 }

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

@@ -44,6 +44,10 @@ public class BatchDetailFeignPO extends BaseVOEntity{
     @Excel(name = "批次标签")
     private String batchLabels;
 
+    @ApiModelProperty("字段名称")
+    @Excel(name = "字段名称")
+    private String fieldName;
+
     @ApiModelProperty("输入控制: 1-必填 2-可选")
     @Excel(name = "输入控制: 1-必填 2-可选")
     private String inputControl;
@@ -56,6 +60,10 @@ public class BatchDetailFeignPO extends BaseVOEntity{
     @Excel(name = "属性选项")
     private String attributeOption;
 
+    @ApiModelProperty("是否显示: 0-不显示 1-显示")
+    @Excel(name = "是否显示: 0-不显示 1-显示")
+    private Integer isDisplay;
+
     @ApiModelProperty("备注")
     @Excel(name = "备注")
     private String remark;

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

@@ -181,5 +181,35 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
     @ApiModelProperty("是否公用: 1-是 2-否")
     @Excel(name = "是否公用: 1-是 2-否")
     private Integer common;
+
+    @ApiModelProperty("SKU码")
+    private String skuCode;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("原产国")
+    private String originCountry;
+
+    @ApiModelProperty("HS码")
+    private String hsCode;
+
+    @ApiModelProperty("申报单位")
+    private String declarationUnit;
+
+    @ApiModelProperty("法定单位")
+    private String statutoryUnit;
+
+    @ApiModelProperty("法定第二单位")
+    private String statutorySecondUnit;
+    /**
+     * 规格型号
+     */
+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
+    @ApiModelProperty("币制")
+    private String currency;
 }
 

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

@@ -0,0 +1,149 @@
+package com.mhd.system.api.domain;
+
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 物料库存对象 material_inventory
+ *
+ * @author gen
+ * @date 2024-05-29
+ */
+
+@Data
+public class MaterialInventoryDTO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物料库存id")
+    private Long materialInventoryId;
+
+    @ApiModelProperty("组织表ID")
+    @Excel(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    @Excel(name = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("物料基础信息id")
+    @Excel(name = "物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("上架单物料明细id")
+    @Excel(name = "上架单物料明细id")
+    private Long materialDetailId;
+
+    @ApiModelProperty("仓库id")
+    @Excel(name = "仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    @Excel(name = "仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("库区id")
+    @Excel(name = "库区id")
+    private Long storageSectionId;
+
+    @ApiModelProperty("库区编码")
+    @Excel(name = "库区编码")
+    private String storageCode;
+
+    @ApiModelProperty("库区名称")
+    @Excel(name = "库区名称")
+    private String storageName;
+
+    @ApiModelProperty("库位id")
+    @Excel(name = "库位id")
+    private Long storageLocationId;
+
+    @ApiModelProperty("库位编码")
+    @Excel(name = "库位编码")
+    private String storageLocationCode;
+
+    @ApiModelProperty("库位名称")
+    @Excel(name = "库位名称")
+    private String storageLocationName;
+
+    @ApiModelProperty("批次号")
+    @Excel(name = "批次号")
+    private String batchNumber;
+
+    @ApiModelProperty("物料状态编码")
+    @Excel(name = "物料状态编码")
+    private String materialStatusCode;
+
+    @ApiModelProperty("物料状态名称")
+    @Excel(name = "物料状态名称")
+    private String materialStatusName;
+
+    @ApiModelProperty("容器id")
+    @Excel(name = "容器id")
+    private Long containerId;
+
+    @ApiModelProperty("容器编码")
+    @Excel(name = "容器编码")
+    private String containerCode;
+
+    @ApiModelProperty("容器类型 数据字典")
+    @Excel(name = "容器类型 数据字典")
+    private String containerType;
+
+    @ApiModelProperty("容器类型名称 数据字典")
+    @Excel(name = "容器类型名称 数据字典")
+    private String containerTypeName;
+
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
+
+    @ApiModelProperty("可用数量")
+    @Excel(name = "可用数量")
+    private BigDecimal allocationQuantity;
+
+    @ApiModelProperty("冻结数量")
+    @Excel(name = "冻结数量")
+    private BigDecimal freezeQuantity;
+
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(name = "组织ID集合")
+    private List<Long> organizationIdList;
+
+    @ApiModelProperty(name = "权限菜单ID")
+    private Long permissionMenuId;
+
+    @ApiModelProperty("盘点是否可用：0-禁用 1-可用")
+    @Excel(name = "盘点是否可用：0-禁用 1-可用")
+    private Integer isAble;
+
+    @ApiModelProperty("货主信息")
+    @Excel(name = "货主信息")
+    private String shipperInfo;
+
+    @ApiModelProperty("物料信息")
+    @Excel(name = "物料信息")
+    private String materialInfo;
+
+    @ApiModelProperty("物料/库位信息")
+    @Excel(name = "物料/库位信息")
+    private String storageInfo;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
+}

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

@@ -219,6 +219,11 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
                 return AjaxResult.error("查询关联仓库列表根据关联id查询失败");
             }
 
+            @Override
+            public AjaxResult queryListCorrelationId(Long warehouseId) {
+                return AjaxResult.error("查询仓库关联的用户ID集合失败");
+            }
+
             @Override
             public AjaxResult getSubInfoByCode(String subjectCode) {
                 return AjaxResult.error("获取科目信息失败" + throwable.getMessage());

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

@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -78,11 +79,17 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
                 return AjaxResult.error("根据车辆id查询司机失败:" + throwable.getMessage());
             }
 
+            @GetMapping("/userApi/getInfo/{userId}")
             @Override
             public AjaxResult getInfo(Long userId) {
                 return AjaxResult.error("根据用户ID查询用户详细信息失败:" + throwable.getMessage());
             }
 
+            @Override
+            public AjaxResult getInfoByName(String userName) {
+                return AjaxResult.error("根据用户userName查询用户详细信息失败:" + throwable.getMessage());
+            }
+
             @Override
             public AjaxResult bindDriverShipList(Long vehicleId) {
                 return AjaxResult.error("查询车辆绑定的承运人列表信息失败:" + throwable.getMessage());
@@ -176,4 +183,4 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
             }
         };
     }
-}
+}

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

@@ -5,6 +5,7 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.WlhyServiceFeign;
 import com.mhd.system.api.WmsServiceFeign;
 import com.mhd.system.api.domain.MaterialBaseInfoFeign;
+import com.mhd.system.api.domain.MaterialInventoryDTO;
 import com.mhd.system.api.domain.NoticeOrderDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +13,8 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 
+import java.util.Map;
+
 /**
  * @author ZhouGY
  * @title RemoteWmsFallbackFactory
@@ -46,6 +49,11 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             public AjaxResult stockOutOrInInsert(NoticeOrderDTO noticeOrderDTO) {
                 return AjaxResult.error(cause.getMessage());
             }
+
+            @Override
+            public AjaxResult materialInventoryApiListAll(MaterialInventoryDTO materialInventoryDTO) {
+                return AjaxResult.error(cause.getMessage());
+            }
         };
     }
 }