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

2026-02-02 13:42:13 +08:00
parent 821f1bf956 29aa101654
commit 99d0e2593d
15 changed files with 967 additions and 21 deletions
@@ -1,12 +1,15 @@
 package com.mhd.wms.domain.investigetionManageDetail.repository.po;

+import com.baomidou.mybatisplus.annotation.TableField;
 import com.mhd.common.core.annotation.Excel;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 import java.math.BigDecimal;
+import java.util.List;


 /**
@@ -204,5 +207,8 @@ public class InvestigetionManageDetailPO extends BaseVOEntity {
    @Excel(name = "物料状态名称")
    private String materialStatusName;

+    @ApiModelProperty("更多属性明细列表")
+    @TableField(exist = false)
+    private List<MaterialMoreDetailPO> materialMoreDetailList;

 }
@@ -88,4 +88,11 @@ public interface MaterialInventoryMapper extends BaseMapper<MaterialInventory>
    MaterialInventoryPO selectOneByWhere(MaterialInventoryDO materialInventoryDO);

    List<MaterialInventoryPO> selectListByWhere(MaterialInventory materialInventory);
+
+    /**
+     * 根据库存ID查询库存信息（包含批次属性字段）
+     * @param materialInventoryId 库存ID
+     * @return 库存信息
+     */
+    MaterialInventoryPO selectByIdWithBatchAttributes(@Param("materialInventoryId") Long materialInventoryId);
 }
@@ -308,7 +308,7 @@ public class OutMaterialDetail extends BaseVOEntity {
     */
    @ApiModelProperty("箱号/卡板号")
    @Excel(name = "箱号/卡板号")
-    private String casePalletNo;
+    private String boxPalletNo;

    /**
     * 币制
@@ -1,8 +1,10 @@
 package com.mhd.wms.domain.outMaterialDetail.repository.po;

+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.mhd.common.core.annotation.Excel;
+import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderBaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -315,7 +317,7 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
     */
    @ApiModelProperty("箱号/卡板号")
    @Excel(name = "箱号/卡板号")
-    private String casePalletNo;
+    private String boxPalletNo;

    /**
     * 币制
@@ -392,4 +394,8 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
    @ApiModelProperty("单位")
    @Excel(name = "单位")
    private String unit;
+
+    @ApiModelProperty("更多属性明细列表")
+    @TableField(exist = false)
+    private List<MaterialMoreDetailPO> materialMoreDetailList;
 }
@@ -323,7 +323,7 @@ public class OutMaterialDetailDO extends BaseVOEntity {
     */
    @ApiModelProperty("箱号/卡板号")
    @Excel(name = "箱号/卡板号")
-    private String casePalletNo;
+    private String boxPalletNo;

    /**
     * 币制
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.mhd.common.core.annotation.Excel;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
 import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.po.OutMaterialDetailSerialNumberPO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -250,5 +251,8 @@ public class ShiftMaterialDetailPO extends BaseVOEntity {
    @ApiModelProperty("序列号")
    private List<OutMaterialDetailSerialNumberPO> materialDetailSerialNumberList;

+    @ApiModelProperty("更多属性明细列表")
+    @TableField(exist = false)
+    private List<MaterialMoreDetailPO> materialMoreDetailList;

 }
@@ -196,10 +196,10 @@ public class ExcelParseService {
        if (StringUtils.isEmpty(stockOutOrder.getCarrier())) errorMsg.append("承运商不能为空; ");
        if (StringUtils.isEmpty(stockOutOrder.getTransportModeCode())) errorMsg.append("运输方式不能为空; ");
        if (StringUtils.isEmpty(stockOutOrder.getSupervisionModeCode())) errorMsg.append("监督方式不能为空; ");
-        if (StringUtils.isEmpty(stockOutOrder.getContainerNo())) errorMsg.append("柜号不能为空; ");
+//        if (StringUtils.isEmpty(stockOutOrder.getContainerNo())) errorMsg.append("柜号不能为空; ");
        if (StringUtils.isEmpty(stockOutOrder.getDepartureArrivalCountry())) errorMsg.append("出发/到达国家不能为空; ");
        if (StringUtils.isEmpty(stockOutOrder.getManufacturer())) errorMsg.append("制造商不能为空; ");
-        if (ObjectUtil.isEmpty(stockOutOrder.getOutboundDate())) errorMsg.append("出仓日期不能为空; ");
+//        if (ObjectUtil.isEmpty(stockOutOrder.getOutboundDate())) errorMsg.append("出仓日期不能为空; ");
        if (StringUtils.isEmpty(stockOutOrder.getContactPerson())) errorMsg.append("联系人不能为空; ");
        if (StringUtils.isEmpty(stockOutOrder.getTel())) errorMsg.append("Tel不能为空; ");
        if (StringUtils.isEmpty(stockOutOrder.getFax())) errorMsg.append("Fax不能为空; ");
@@ -71,7 +71,7 @@ public class ItemListener extends AnalysisEventListener<Map<Integer, Object>> {
        item.setSheetRefNo(getStringValue(rowData[18]));
        item.setCountryOfOrigin(getStringValue(rowData[19]));

-        item.setCasePalletNo(getStringValue(rowData[20]));
+        item.setBoxPalletNo(getStringValue(rowData[20]));
        item.setTotalAmount(parseBigDecimal(rowData[21]));
        item.setCurrency(getStringValue(rowData[22]));
        item.setRemark(getStringValue(rowData[23]));