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

oms小程序出入库明细查询;

Browse Source
This commit is contained in:
王奎兴
2026-05-15 10:54:41 +08:00
parent d0836cb5c6
commit e5a375f67c
24 changed files with 378 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
+4
View File
@@ -278,6 +278,10 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity {
@Excel(name = "升")
private BigDecimal liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
@ApiModelProperty("尺寸")
@Excel(name = "尺寸")
private String dimensions;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java
+4
View File
@@ -288,6 +288,10 @@ public class ReservationOutMaterialDetailDTO extends BaseVOEntity {
@Excel(name = "升")
private String liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
/**
* 尺寸
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/facade/IReserveStockInOrderService.java
+2
View File
@@ -23,6 +23,8 @@ public interface IReserveStockInOrderService extends IService<ReserveStockInOrde
*/
public List<ReserveStockInOrderPO> queryList(ReserveStockInOrderDO stockInOrderDO);
public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO);
public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO);
/**
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/mapper/ReserveStockInOrderMapper.java
+2
View File
@@ -27,6 +27,8 @@ public interface ReserveStockInOrderMapper extends BaseMapper<ReserveStockInOrde
*/
public List<ReserveStockInOrderPO> queryList(ReserveStockInOrderDO stockInOrderDO);
public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO);
public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO);
public MaterialBaseInfoPO getinfo(@Param("id") Long id);
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/persistence/ReserveStockInOrderImpl.java
+6
View File
@@ -37,6 +37,12 @@ public class ReserveStockInOrderImpl extends ServiceImpl<ReserveStockInOrderMapp
return stockInOrderMapper.queryList(stockInOrderDO);
}
@Override
public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO)
{
return stockInOrderMapper.detailsList(stockInOrderDO);
}
@Override
public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO)
{
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
+37
View File
@@ -169,6 +169,43 @@ public class ReserveStockInOrderApplicationService {
}
public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null && loginUser.getUserPo() != null){
Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
Long frontendOrganizationId = stockInOrderDO.getOrganizationId();
if (userOrganizationId != null && userOrganizationId == 2827L) {
if (frontendOrganizationId != null) {
stockInOrderDO.setOrganizationId(frontendOrganizationId);
stockInOrderDO.setTopOrganizationId(null);
} else {
stockInOrderDO.setOrganizationId(null);
stockInOrderDO.setTopOrganizationId(null);
}
} else {
if (frontendOrganizationId != null && userOrganizationId != null) {
if (!frontendOrganizationId.equals(userOrganizationId)) {
stockInOrderDO.setOrganizationId(userOrganizationId);
}
} else {
if (userOrganizationId != null) {
stockInOrderDO.setOrganizationId(userOrganizationId);
}
}
if (stockInOrderDO.getOrganizationId() == null) {
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1) {
stockInOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
stockInOrderDO.setTopOrganizationId(2827L);
}
}
}
return stockInOrderDomainService.detailsList(stockInOrderDO);
}
/**
* 分页查询入库单列表
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java
+4
View File
@@ -86,6 +86,10 @@ public class ReserveStockInOrderDomainService {
return stockInOrderService.queryList(stockInOrderDO);
}
public List<ReserveInMaterialDetailPO> detailsList(ReserveStockInOrderDO stockInOrderDO) {
return stockInOrderService.detailsList(stockInOrderDO);
}
public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO) {
return stockInOrderService.inAndOutList(stockInOrderDO);
}
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/facade/IReserveStockOutOrderService.java
+2
View File
@@ -22,6 +22,8 @@ public interface IReserveStockOutOrderService extends IService<ReserveStockOutOr
*/
public List<ReserveStockOutOrderPO> queryList(ReserveStockOutOrderDO stockOutOrderDO);
public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO);
/**
* 新增出库单
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java
+2
View File
@@ -22,6 +22,8 @@ public interface ReserveStockOutOrderMapper extends BaseMapper<ReserveStockOutOr
*/
public List<ReserveStockOutOrderPO> queryList(ReserveStockOutOrderDO stockOutOrderDO);
public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO);
/**
* 出库单提货单打印-表头
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/persistence/ReserveStockOutOrderImpl.java
+6
View File
@@ -35,6 +35,12 @@ public class ReserveStockOutOrderImpl extends ServiceImpl<ReserveStockOutOrderMa
return reservationStockOutOrderMapper.queryList(stockOutOrderDO);
}
@Override
public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO)
{
return reservationStockOutOrderMapper.detailsList(stockOutOrderDO);
}
/**
* 新增出库单
*/
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java
+40
View File
@@ -205,6 +205,46 @@ public class ReserveStockOutOrderApplicationService {
return stockOutOrderPOS;
}
public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null && loginUser.getUserPo() != null) {
Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
Long frontendOrganizationId = stockOutOrderDO.getOrganizationId();
if (userOrganizationId != null && userOrganizationId == 2827L) {
if (frontendOrganizationId != null) {
stockOutOrderDO.setOrganizationId(frontendOrganizationId);
stockOutOrderDO.setTopOrganizationId(null);
} else {
stockOutOrderDO.setOrganizationId(null);
stockOutOrderDO.setTopOrganizationId(null);
}
} else {
if (frontendOrganizationId != null && userOrganizationId != null) {
if (!frontendOrganizationId.equals(userOrganizationId)) {
stockOutOrderDO.setOrganizationId(userOrganizationId);
}
} else {
if (userOrganizationId != null) {
stockOutOrderDO.setOrganizationId(userOrganizationId);
}
}
if (stockOutOrderDO.getOrganizationId() == null) {
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1) {
stockOutOrderDO.setTopOrganizationId(topOrganizationId);
}
} else {
stockOutOrderDO.setTopOrganizationId(2827L);
}
}
}
List<ReserveOutMaterialDetailPO> stockOutOrderPOS = stockOutOrderDomainService.detailsList(stockOutOrderDO);
return stockOutOrderPOS;
}
/**
* 新增出库单
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+4
View File
@@ -78,6 +78,10 @@ public class ReserveStockOutOrderDomainService {
return stockOutOrderService.queryList(stockOutOrderDO);
}
public List<ReserveOutMaterialDetailPO> detailsList(ReserveStockOutOrderDO stockOutOrderDO) {
return stockOutOrderService.detailsList(stockOutOrderDO);
}
/**
* 新增出库单
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReserveStockOutOrder/ReserveStockOutOrderApi.java
+11
View File
@@ -67,6 +67,17 @@ public class ReserveStockOutOrderApi extends BaseController {
return getDataTable(list);
}
@ApiOperation("查询出库单列表")
@GetMapping("/detailsList")
public TableDataInfo detailsList(ReserveStockOutOrderDTO stockOutOrderDTO)
{
//转换实体
ReserveStockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO);
startPage();
List<ReserveOutMaterialDetailPO> list = stockOutOrderApplicationService.detailsList(stockOutOrderDO);
return getDataTable(list);
}
/**
* 审核入库单
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reserveStockInOrder/ReserveStockInOrderApi.java
+14
View File
@@ -57,6 +57,20 @@ public class ReserveStockInOrderApi extends BaseController {
return getDataTable(list);
}
/**
* 分页查询入库单列表
*/
@ApiOperation("查询入库单列表")
@GetMapping("/detailsList")
public TableDataInfo detailsList(ReserveStockInOrderDTO stockInOrderDTO)
{
//转换实体
ReserveStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
startPage();
List<ReserveInMaterialDetailPO> list = stockInOrderApplicationService.detailsList(stockInOrderDO);
return getDataTable(list);
}
@ApiOperation("查询入库单列表")
@GetMapping("/inAndOutList")
public TableDataInfo inAndOutList(ReserveStockInOrderDTO stockInOrderDTO)
mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+104
View File
@@ -455,6 +455,110 @@
</select>
<resultMap type="com.mhd.oms.domain.reserveInMaterialDetail.repository.po.ReserveInMaterialDetailPO" id="MaterialDetailResult">
<result property="materialDetailId" column="material_detail_id" />
<result property="organizationId" column="organization_id" />
<result property="organizationName" column="organization_name" />
<result property="topOrganizationId" column="top_organization_id" />
<result property="uniqueId" column="unique_id" />
<result property="materialBaseInfoId" column="material_base_info_id" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="barCode" column="bar_code" />
<result property="quantity" column="quantity" />
<result property="receiptQuantity" column="receipt_quantity" />
<result property="shelvesQuantity" column="shelves_quantity" />
<result property="packId" column="pack_id" />
<result property="packCode" column="pack_code" />
<result property="packName" column="pack_name" />
<result property="packDetailId" column="pack_detail_id" jdbcType="BIGINT" />
<result property="unitCode" column="unit_code" />
<result property="unitName" column="unit_name" />
<result property="materialWarehouseControlId" column="material_warehouse_control_id" />
<result property="serialNumberManage" column="serial_number_manage" />
<result property="qualityInspectionManage" column="quality_inspection_manage" />
<result property="qualityInspectionStage" column="quality_inspection_stage" />
<result property="qualityInspectionRule" column="quality_inspection_rule" />
<result property="qualityInspectionTerm" column="quality_inspection_term" />
<result property="qualityInspectionResults" column="quality_inspection_results" />
<result property="allowOvercharge" column="allow_overcharge" />
<result property="overchargeRatio" column="overcharge_ratio" />
<result property="batchNumber" column="batch_number" />
<result property="materialStatusCode" column="material_status_code" />
<result property="materialStatusName" column="material_status_name" />
<result property="distributeRuleId" column="distribute_rule_id" />
<result property="distributeRuleCode" column="distribute_rule_code" />
<result property="distributeRuleName" column="distribute_rule_name" />
<result property="containerId" column="container_id" />
<result property="containerCode" column="container_code" />
<result property="containerType" column="container_type" />
<result property="containerTypeName" column="container_type_name" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="createByName" column="create_by_name" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updateByName" column="update_by_name" />
<result property="delFlag" column="del_flag" />
<result property="overStockId" column="over_stock_id" />
<result property="overStockStatus" column="over_stock_status" />
<result property="overStockType" column="over_stock_type" />
<result property="specificationModel" column="SPECIFICATION_MODEL" />
<result property="skuCode" column="SKU_CODE" />
<result property="invoiceNo" column="INVOICE_NO" />
<result property="liter" column="LITER" />
<result property="dimensions" column="DIMENSIONS" />
<result property="declarationUnit" column="DECLARATION_UNIT" />
<result property="batchRefNo" column="BATCH_REF_NO" />
<result property="sheetRefNo" column="SHEET_REF_NO" />
<result property="originCountry" column="ORIGIN_COUNTRY" />
<result property="boxPalletNo" column="BOX_PALLET_NO" />
<result property="currency" column="CURRENCY" />
<result property="unit" column="UNIT" />
<result property="declaredQuantity" column="DECLARED_QUANTITY" />
<result property="boxCount" column="BOX_COUNT" />
<result property="pieceCount" column="PIECE_COUNT" />
<result property="inboundQuantity" column="INBOUND_QUANTITY" />
<result property="totalNetWeight" column="TOTAL_NET_WEIGHT" />
<result property="totalGrossWeight" column="TOTAL_GROSS_WEIGHT" />
<result property="totalVolume" column="TOTAL_VOLUME" />
<result property="totalArea" column="TOTAL_AREA" />
<result property="totalPrice" column="TOTAL_PRICE" />
<result property="productionDate" column="PRODUCTION_DATE" />
<result property="expiryDate" column="EXPIRY_DATE" />
<result property="inventoryDate" column="INVENTORY_DATE" />
<result property="extAttr1" column="EXT_ATTR_1" />
<result property="extAttr2" column="EXT_ATTR_2" />
<result property="extAttr3" column="EXT_ATTR_3" />
<result property="extAttr4" column="EXT_ATTR_4" />
<result property="contractFee" column="contract_fee" />
<result property="monthlyWarehouseFee" column="monthly_warehouse_fee" />
<result property="halfMonthWhFee" column="half_month_wh_fee" />
<result property="discountRate" column="discount_rate" />
<result property="singleVolume" column="single_volume" />
<result property="singleGrossWeight" column="single_gross_weight" />
<result property="lotNo" column="lot_no" />
<result property="reserveQuantity" column="reserve_quantity" />
<result property="reserveGrossWeight" column="reserve_gross_weight" />
<result property="reserveNetWeight" column="reserve_net_weight" />
<result property="reserveVolume" column="reserve_volume" />
<result property="reserveArea" column="reserve_area" />
<result property="reservePrice" column="reserve_price" />
<result property="reserveUnitPrice" column="reserve_unit_price" />
<result property="shelfLife" column="shelf_life" />
</resultMap>
<select id="detailsList" parameterType="com.mhd.oms.domain.reserveStockInOrder.repository.todo.ReserveStockInOrderDO" resultMap="MaterialDetailResult">
select b.*
from reserve_stock_in_order a left join reserve_in_material_detail b on a.IN_ORDER_NUMBER = b.IN_ORDER_NUMBER
<where>
<include refid="selectStockInOrderPo1"/>
</where>
ORDER BY a.create_time IS NULL, a.create_time DESC
</select>
<select id="inAndOutList" parameterType="com.mhd.oms.domain.reserveStockInOrder.repository.todo.ReserveStockInOrderDO" resultType="com.mhd.oms.domain.reserveStockInOrder.repository.vo.InAndOutListVo">
select * from
(
mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
+107
View File
@@ -343,6 +343,113 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<resultMap type="com.mhd.oms.domain.reserveOutMaterialDetail.repository.po.ReserveOutMaterialDetailPO" id="MaterialDetailResult">
<result property="materialDetailId" column="material_detail_id" />
<result property="organizationId" column="organization_id" />
<result property="organizationName" column="organization_name" />
<result property="topOrganizationId" column="top_organization_id" />
<result property="uniqueId" column="unique_id" />
<result property="outOrderNumber" column="out_order_number" />
<result property="materialBaseInfoId" column="material_base_info_id" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
<result property="barCode" column="bar_code" />
<result property="weightLimit" column="weight_limit" />
<result property="volumeLimit" column="volume_limit" />
<result property="quantity" column="quantity" />
<result property="allocationQuantity" column="allocation_quantity" />
<result property="pickingQuantity" column="picking_quantity" />
<result property="checkQuantity" column="check_quantity" />
<result property="waitCheckQuantity" column="WAIT_CHECK_QUANTITY" />
<result property="packId" column="pack_id" />
<result property="packCode" column="pack_code" />
<result property="packName" column="pack_name" />
<result property="packDetailId" column="pack_detail_id" />
<result property="unitCode" column="unit_code" />
<result property="unitName" column="unit_name" />
<result property="materialWarehouseControlId" column="material_warehouse_control_id" />
<result property="serialNumberManage" column="serial_number_manage" />
<result property="materialInventoryId" column="material_inventory_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseCode" column="warehouse_code" />
<result property="warehouseName" column="warehouse_name" />
<result property="storageSectionId" column="storage_section_id" />
<result property="storageCode" column="storage_code" />
<result property="storageName" column="storage_name" />
<result property="storageLocationId" column="storage_location_id" />
<result property="storageLocationCode" column="storage_location_code" />
<result property="storageLocationName" column="storage_location_name" />
<result property="level" column="level" />
<result property="parentUniqueId" column="parent_unique_id" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="createByName" column="create_by_name" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updateByName" column="update_by_name" />
<result property="delFlag" column="del_flag" />
<result property="overStockId" column="over_stock_id" />
<result property="overStockStatus" column="over_stock_status" />
<result property="overStockType" column="over_stock_type" />
<result property="commodityName" column="COMMODITY_NAME" />
<result property="commodityNo" column="COMMODITY_NO" />
<result property="materialNo" column="MATERIAL_NO" />
<result property="specificationModel" column="SPECIFICATION_MODEL" />
<result property="skucode" column="SKUCODE" />
<result property="invoiceNo" column="INVOICE_NO" />
<result property="liter" column="LITER" />
<result property="size" column="SIZE" />
<result property="declareUnit" column="DECLARE_UNIT" />
<result property="batchRefNo" column="BATCH_REF_NO" />
<result property="sheetRefNo" column="SHEET_REF_NO" />
<result property="countryOfOrigin" column="COUNTRY_OF_ORIGIN" />
<result property="boxPalletNo" column="BOX_PALLET_NO" />
<result property="currency" column="CURRENCY" />
<result property="declareQuantity" column="DECLARE_QUANTITY" />
<result property="caseCount" column="CASE_COUNT" />
<result property="pieceCount" column="PIECE_COUNT" />
<result property="outboundQuantity" column="OUTBOUND_QUANTITY" />
<result property="totalNetWeight" column="TOTAL_NET_WEIGHT" />
<result property="totalGrossWeight" column="TOTAL_GROSS_WEIGHT" />
<result property="totalVolume" column="TOTAL_VOLUME" />
<result property="totalArea" column="TOTAL_AREA" />
<result property="totalAmount" column="TOTAL_AMOUNT" />
<result property="unit" column="UNIT" />
<result property="extAttr1" column="EXT_ATTR_1" />
<result property="extAttr2" column="EXT_ATTR_2" />
<result property="productionDate" column="PRODUCTION_DATE" />
<result property="expiryDate" column="EXPIRY_DATE" />
<result property="inventoryDate" column="INVENTORY_DATE" />
<result property="extAttr3" column="EXT_ATTR_3" />
<result property="extAttr4" column="EXT_ATTR_4" />
<result property="contractFee" column="contract_fee" />
<result property="monthlyWarehouseFee" column="monthly_warehouse_fee" />
<result property="halfMonthWhFee" column="half_month_wh_fee" />
<result property="discountRate" column="discount_rate" />
<result property="singleVolume" column="single_volume" />
<result property="singleGrossWeight" column="single_gross_weight" />
<result property="lotNo" column="lot_no" />
<result property="inOrderNumber" column="in_order_number" />
<result property="stockUnit" column="stock_unit" />
<result property="stockQuantity" column="stock_quantity" />
<result property="perWeight" column="PER_WEIGHT" />
<result property="coefficient" column="COEFFICIENT" />
<result property="reservePrice" column="reserve_price" />
<result property="reserveUnitPrice" column="reserve_unit_price" />
</resultMap>
<select id="detailsList" parameterType="com.mhd.oms.domain.reserveStockOutOrder.repository.todo.ReserveStockOutOrderDO" resultMap="MaterialDetailResult">
select
b.*
from reserve_stock_out_order a left join reserve_out_material_detail b on a.OUT_ORDER_NUMBER = b.OUT_ORDER_NUMBER
<where>
<include refid="selectStockOutOrderPo1"/>
</where>
order by a.create_time desc nulls last
</select>
<!-- 出库单提货单打印-表头查询 -->
<select id="queryOutStockNoticePrint" resultMap="StockOutOrderResult">
SELECT
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+2
View File
@@ -1601,6 +1601,8 @@ public class StockInOrderApplicationService {
MaterialBaseInfoPO materialBaseInfo = materialBaseInfoService.getInfo(materialBaseInfoId);
if (materialBaseInfo != null && StringUtils.isNotBlank(materialBaseInfo.getMaterialCode())) {
materialCode = materialBaseInfo.getMaterialCode();
BigDecimal unitPrice = materialBaseInfo.getUnitPrice();
d.setUnitPrice(unitPrice);
log.info("根据物料ID自动补充料号，物料ID: {}, 料号: {}", materialBaseInfoId, materialCode);
}
} catch (Exception e) {
mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java
+4
View File
@@ -269,6 +269,10 @@ public class InMaterialDetail extends BaseVOEntity {
@Excel(name = "升")
private BigDecimal liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
@ApiModelProperty("尺寸")
@Excel(name = "尺寸")
private String dimensions;
mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java
+4
View File
@@ -282,6 +282,10 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
@Excel(name = "升")
private BigDecimal liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
@ApiModelProperty("尺寸")
@Excel(name = "尺寸")
private String dimensions;
mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java
+4
View File
@@ -276,6 +276,10 @@ public class InMaterialDetailDO extends StockInOrderBaseDO {
@Excel(name = "升")
private BigDecimal liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
@ApiModelProperty("尺寸")
@Excel(name = "尺寸")
private String dimensions;
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java
+4
View File
@@ -275,6 +275,10 @@ public class OutMaterialDetail extends BaseVOEntity {
@Excel(name = "升")
private String liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
/**
* 尺寸
*/
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java
+4
View File
@@ -293,6 +293,10 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
@Excel(name = "升")
private String liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
/**
* 尺寸
*/
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java
+4
View File
@@ -296,6 +296,10 @@ public class OutMaterialDetailDO extends BaseVOEntity {
@Excel(name = "升")
private String liter;
@ApiModelProperty("单价")
@Excel(name = "单价")
private BigDecimal unitPrice;
/**
* 尺寸
*/
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java
+3
View File
@@ -36,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -431,6 +432,8 @@ public class ExcelParseService {
if (materialList != null && !materialList.isEmpty()) {
materialBaseInfoPO = materialList.get(0);
materialBaseInfoId = materialBaseInfoPO.getMaterialBaseInfoId();
BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
outMaterialDetailDO.setUnitPrice(unitPrice);
}
}