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

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/mapper/BusinessDocumentCargoMultiMapper.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
 import com.mhd.oms.domain.businessDocumentCargoMulti.repository.po.BusinessDocumentCargoMultiPO;
 import com.mhd.oms.domain.businessDocumentCargoMulti.repository.todo.BusinessDocumentCargoMultiDO;
+import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 /**
  * 【请填写功能名称】Mapper接口
  * 
@@ -19,4 +22,6 @@ public interface BusinessDocumentCargoMultiMapper extends BaseMapper<BusinessDoc
      */
     public List<BusinessDocumentCargoMultiPO> queryList(BusinessDocumentCargoMultiDO businessDocumentCargoMultiDO);
 
+
+    List<BusinessDocumentCargoMultiPO> selectBatchByOrderId(@Param("orderId") String orderId);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java

@@ -67,5 +67,9 @@ public class BusinessDocumentCargoMultiPO extends BaseVOEntity{
 
     @ApiModelProperty("物料id")
     private Long materialBaseInfoId;
+    @ApiModelProperty("订单id")
+    private String OrderId;
+    @ApiModelProperty("货物信息-件数")
+    private BigDecimal CargoNum;
 
 }