出库流程操作库存;出库单导入调整;

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java

@@ -4,6 +4,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.outMaterialDetail.repository.todo.OutMaterialDetailDO;
 import com.mhd.wms.interfaces.dto.outMaterialDetailSerialNumber.OutMaterialDetailSerialNumberDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -147,6 +148,9 @@ public class OutMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "物料状态名称")
     private String materialStatusName;
 
+    @ApiModelProperty("物料明细子集")
+    private List<OutMaterialDetailDO> children;
+
     @ApiModelProperty("容器id")
     @Excel(name = "容器id")
     private Long containerId;

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java

@@ -82,8 +82,12 @@ public class StockOutOrderApi extends BaseController {
 
         try {
             // 解析Excel并返回结果
-            StockOutOrderDO result = excelParseService.parseOutboundOrderExcel(file, warehouseName, warehouseCode, warehouseId);
-            return AjaxResult.success(result);
+            StringBuilder result = excelParseService.parseOutboundOrderExcel(file, warehouseName, warehouseCode, warehouseId);
+            if (result.length() > 0) {
+                return AjaxResult.error(result.toString());
+            } else {
+                return AjaxResult.success(result);
+            }
         } catch (IOException e) {
             return error("解析失败");
         }