Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2,10 +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.system.api.domain.InMaterialDetail;
-import com.mhd.system.api.domain.OutMaterialDetail;
-import com.mhd.system.api.domain.StockInOrder;
-import com.mhd.system.api.domain.StockOutOrder;
+import com.mhd.system.api.domain.*;
 import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import io.swagger.annotations.ApiOperation;
@@ -33,4 +30,8 @@ public interface OmsServiceFeign {
     @ApiOperation("wms推送入库单明细")
     @PostMapping(value = "/reservationStockOutOrderApi/pushOutOrderDetail")
     public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetail outMaterialDetail);
+
+    @ApiOperation("编辑物料库存")
+    @PostMapping("/materialInventoryApi/omsEdit")
+    public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO);
 }

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

@@ -0,0 +1,79 @@
+package com.mhd.system.api.domain;
+
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.system.api.model.LoginUser;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * 物料库存对象 material_inventory
+ *
+ * @author gen
+ * @date 2024-05-29
+ */
+
+@Data
+public class MaterialInventoryOmsParamDO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+    //库存id
+    private Long materialInventoryId;
+    //物料基础信息id
+    private Long materialBaseInfoId;
+    //物料明细ID
+    private Long materialDetailId;
+    //仓库信息参数
+    private Long organizationId;
+    private String organizationName;
+    private Long topOrganizationId;
+    //仓库ID
+    private Long warehouseId;
+    //仓库编码
+    private String warehouseCode;
+    //仓库名称
+    private String warehouseName;
+    //存储区ID
+    private Long storageSectionId;
+    //存储区编码
+    private String storageCode;
+    //存储区名称
+    private String storageName;
+    //存储位置ID
+    private Long storageLocationId;
+    //存储位置编码
+    private String storageLocationCode;
+    //存储位置名称
+    private String storageLocationName;
+    //调整数量
+    private BigDecimal quantity;
+    //净重
+    private BigDecimal netWeight;
+    //毛重
+    private BigDecimal grossWeight;
+    //体积
+    private BigDecimal volume;
+    //面积
+    private BigDecimal area;
+    //类型(1:上架2:分配3:取消分配4:出库交接5:移位6:库存调整7:库存冻结)
+    private String type;
+
+    private String barCode;
+
+    private String inOrderNumber;
+
+    private String lotNumber;
+
+    private String batchNumber;
+
+    private String isNew;
+
+    /** 业务关联单号（出库单号、交接单对应单号等），用于库存调整记录 relate_no；可与入库单号区分 */
+    private String relateNo;
+
+    private String kctzType;
+
+    private LoginUser loginUser;
+
+}

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

@@ -356,4 +356,10 @@ public class StockInOrder extends BaseVOEntity {
     @ApiModelProperty("oms入库单id")
     @Excel(name = "oms入库单id")
     private String omsStockInOrderId;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

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

@@ -395,4 +395,11 @@ public class StockOutOrder extends BaseVOEntity {
     @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date documentDate;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
+
 }