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

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

@@ -109,6 +109,13 @@ public interface UserServiceFeign {
     @GetMapping("/userApi/getInfo/{userId}")
     public AjaxResult getInfo(@PathVariable("userId") Long userId);
 
+    /**
+     * 根据用户ID查询用户详细信息
+     */
+    @ApiOperation("根据用户ID查询用户详细信息")
+    @GetMapping("/userApi/getInfoByName/{userName}")
+    public AjaxResult getInfoByName(@PathVariable("userName") String userName);
+
 
     /**
      * 查询车辆绑定的承运人列表

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java

@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -78,11 +79,17 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
                 return AjaxResult.error("根据车辆id查询司机失败:" + throwable.getMessage());
             }
 
+            @GetMapping("/userApi/getInfo/{userId}")
             @Override
             public AjaxResult getInfo(Long userId) {
                 return AjaxResult.error("根据用户ID查询用户详细信息失败:" + throwable.getMessage());
             }
 
+            @Override
+            public AjaxResult getInfoByName(String userName) {
+                return AjaxResult.error("根据用户userName查询用户详细信息失败:" + throwable.getMessage());
+            }
+
             @Override
             public AjaxResult bindDriverShipList(Long vehicleId) {
                 return AjaxResult.error("查询车辆绑定的承运人列表信息失败:" + throwable.getMessage());

mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java

@@ -440,6 +440,32 @@ public class UserApplicationService {
         return userPo;
     }
 
+    /**
+     * @Description 根据用户ID获取用户信息
+     * @Author Alex
+     * @Date 2022/12/20 17:12
+     */
+    public UserPo selectByUserName(String userName) {
+        if (StringUtils.isEmpty(userName)) {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            userName = loginUser.getUsername();
+        }
+        UserPo userPo = userDomainService.selectByUserName(userName);
+        if (userPo != null){
+            userPo.setPrincipalAccount(userPo.getUserAccount());
+        }
+        if (StringUtils.isNotEmpty(userPo.getRoleCode())){
+            String[] split = userPo.getRoleCode().split(";");
+            List<String> list = CollectionUtil.toList(split);
+            userPo.setRoleCodeList(list);
+        }
+        UserShipperPo userShipperPo = userShipperDomainService.selectByUserId(userPo.getUserId());
+        if(null != userShipperPo){
+            userPo.setEsignEnterpriseStatus(userShipperPo.getEsignEnterpriseStatus());
+        }
+        return userPo;
+    }
+
     /**
      * @Description 分配用户默认普通用户角色
      * @Author Alex

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserRepositoryInterface.java

@@ -27,6 +27,8 @@ public interface UserRepositoryInterface extends IService<UserEntity> {
     UserPo findAdminUserByOrganizationId(UserDO userDO);
 
     UserPo findByUserId(Long userId);
+    UserPo selectByUserName(String userName);
+
 
     UserPo findByTopOrganizationIdAndUserAccount(UserDO userDO);
     UserPo getUserByDingUserId(String dingUserId);
@@ -74,4 +76,3 @@ public interface UserRepositoryInterface extends IService<UserEntity> {
 
     String finShipperEnterpriseNamedByUserId(Long userId);
 }
-

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java

@@ -24,6 +24,8 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     UserPo selectByUserId(Long userId);
 
+    UserPo selectByUserName(String userName);
+
     UserPo selectUserShipperList(UserPo userPo);
 
     List<UserPo> selectUserShipperListWaybill(UserPo userPo);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserRepositoryImpl.java

@@ -64,6 +64,11 @@ public class UserRepositoryImpl extends ServiceImpl<UserMapper,UserEntity> imple
         return userMapper.selectByUserId(userId);
     }
 
+    @Override
+    public UserPo selectByUserName(String userName) {
+        return userMapper.selectByUserName(userName);
+    }
+
     @Override
     public UserEntity selectById(Long userId) {
         return userMapper.selectById(userId);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDomainService.java

@@ -125,6 +125,10 @@ public class UserDomainService {
         return userRepositoryInterface.findByUserId(userId);
     }
 
+    public UserPo selectByUserName(String userName) {
+        return userRepositoryInterface.selectByUserName(userName);
+    }
+
     public void updateWhenLogin(UserDO userDO) {
         userRepositoryInterface.update(new UpdateWrapper<UserEntity>().lambda()
                 .set(UserEntity::getLastLoginIp,userDO.getLastLoginIp()).set(UserEntity::getLastLoginTime,userDO.getLastLoginTime())

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java

@@ -201,6 +201,14 @@ public class UserAPI extends BaseController {
         return AjaxResult.success(userPo);
     }
 
+    @Log(title = "用户中台管理-查询", description ="根据用户ID查询用户详细信息",businessType = BusinessType.INQUIRE)
+    @ApiOperation("根据用户ID查询用户详细信息")
+    @GetMapping("/getInfoByName/{userName}")
+    public AjaxResult getInfoByName(@PathVariable("userName") String userName) {
+        UserPo userPo = userApplicationService.selectByUserName(userName);
+        return AjaxResult.success(userPo);
+    }
+
     /**
      * @Description 新增租户，新增货主，新增司机，新增员工，用户注册等
      * @Author Alex

mhd-user-center/src/main/resources/mapper/UserMapper.xml

@@ -168,6 +168,10 @@
         and a.user_id = #{value}
     </select>
 
+    <select id="selectByUserName" parameterType="java.lang.String" resultType="com.mhd.common.core.domain.po.UserPo">
+        <include refid="selectUserVo"/>
+            and a.user_name = #{value}</select>
+
 
     <!-- 根据用户手机号查询自己以外的用户 -->
     <select id="findByTopOrganizationIdAndUserPhone"

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -403,14 +403,26 @@ public class StockOutOrderApplicationService {
      * @param stockOutOrderDO
      */
     private void shipperParam(StockOutOrderDO stockOutOrderDO){
-        AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(stockOutOrderDO.getCustomerName()));
+        String customerName = stockOutOrderDO.getCustomerName();
-        if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+        if (customerName == null || !customerName.matches("\\d+")) {
-            throw new ServiceException("获取货主信息失败");
+            AjaxResult ajaxResult = userServiceFeign.getInfoByName(customerName);
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取客户信息失败");
+            }
+            UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setShipperId(userPo.getUserId());
+            stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setShipperName(userPo.getUserName());
+        } else {
+            AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(customerName));
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取货主信息失败");
+            }
+            UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setShipperId(userPo.getUserId());
+            stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setShipperName(userPo.getUserName());
         }
-        UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
-        stockOutOrderDO.setShipperId(userPo.getUserId());
-        stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
-        stockOutOrderDO.setShipperName(userPo.getUserName());
     }
 
     /**
@@ -420,13 +432,26 @@ public class StockOutOrderApplicationService {
      * @param stockOutOrderDO
      */
     private void customerParam(StockOutOrderDO stockOutOrderDO){
-        AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(stockOutOrderDO.getCustomerName()));
+        String customerName = stockOutOrderDO.getCustomerName();
-        if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+        if (customerName == null || !customerName.matches("\\d+")) {
-            throw new ServiceException("获取客户信息失败");
+            AjaxResult ajaxResult = userServiceFeign.getInfoByName(customerName);
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取客户信息失败");
+            }
+            UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setCustomerId(userPo.getUserId());
+            stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setCustomerName(userPo.getUserName());
+        } else {
+            AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(customerName));
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取客户信息失败");
+            }
+            UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setCustomerId(userPo.getUserId());
+            stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setCustomerName(userPo.getUserName());
         }
-        UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
-        stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
-        stockOutOrderDO.setCustomerName(userPo.getUserName());
     }
 
     /**

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java

@@ -128,30 +128,40 @@ public class HandoverTaskOrderDomainService {
      * @param handoverTaskOrderDO
      * @return Boolean
      */
-    public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO){
+    public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO) {
-        //交接完成节点修改库存
+        List<Long> handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds();
-        String orderNumber = handoverTaskOrderDO.getOrderNumber();
+        if (handoverTaskOrderIds == null || handoverTaskOrderIds.size() == 0) {
-        List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailMapper.selectList(new QueryWrapper<OutMaterialDetail>().lambda()
+            return false;
-                .eq(OutMaterialDetail::getOutOrderNumber, orderNumber));
+        }
-        for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
+        for (Long handoverTaskOrderId : handoverTaskOrderIds) {
-            Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
+            HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getById(handoverTaskOrderId);
-            BigDecimal checkQuantity = outMaterialDetail.getCheckQuantity();
+            if (handoverTaskOrder == null) {
-            MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
+                return false;
-            if (materialInventoryPO != null) {
+            }
-                //更新库存数量
+            //交接完成节点修改库存
-                //库存数量
+            String orderNumber = handoverTaskOrder.getOrderNumber();
-                BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
+            List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailMapper.selectList(new QueryWrapper<OutMaterialDetail>().lambda()
-                //冻结数量
+                    .eq(OutMaterialDetail::getOutOrderNumber, orderNumber));
-                BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+            for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
-                //分配后库存数量
+                Long materialInventoryId = outMaterialDetail.getMaterialInventoryId();
-                BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(checkQuantity);
+                BigDecimal checkQuantity = outMaterialDetail.getCheckQuantity();
-                //分配后冻结数量
+                MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId);
-                BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(checkQuantity);
+                if (materialInventoryPO != null) {
-                materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+                    //更新库存数量
-                materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+                    //库存数量
-                MaterialInventory materialInventory = new MaterialInventory();
+                    BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity();
-                BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+                    //冻结数量
-                materialInventoryMapper.updateById(materialInventory);
+                    BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity();
+                    //分配后库存数量
+                    BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(checkQuantity);
+                    //分配后冻结数量
+                    BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(checkQuantity);
+                    materialInventoryPO.setInventoryQuantity(newInventoryQuantity);
+                    materialInventoryPO.setFreezeQuantity(newFreezeQuantity);
+                    MaterialInventory materialInventory = new MaterialInventory();
+                    BeanUtils.copyProperties(materialInventoryPO, materialInventory);
+                    materialInventoryMapper.updateById(materialInventory);
+                }
             }
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java

@@ -276,7 +276,7 @@ public class PickingOrderDomainService {
         pickingOrderDO.setPickingOrderNumber(pickingOrderPODb.getPickingOrderNumber());
         PickingOrderPO pickingOrderPO = pickingMaterialDetailService.batchPickingUpdate(pickingOrderDO);
         //修改库存
-        updateMaterialInventory(pickingOrderDO);
+        //updateMaterialInventory(pickingOrderDO);
         //设置拣货单拣货需要更新的数据数据
         updatePickingOrder(pickingOrderPO, pickingOrderPODb);
         //更新出库单状态

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java

@@ -1,18 +1,38 @@
 package com.mhd.wms.domain.stockOutOrder.repository.listener;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.builder.ExcelReaderBuilder;
 import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mhd.common.core.domain.po.SysDictDataVo;
+import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.SystemServiceFeign;
+import com.mhd.system.api.UserServiceFeign;
+import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.application.service.stockOutOrder.StockOutOrderApplicationService;
+import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
+import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper;
+import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
+import com.mhd.wms.domain.stockOutOrder.service.StockOutOrderDomainService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,12 +43,20 @@ public class ExcelParseService {
 
     @Autowired
     private StockOutOrderApplicationService stockOutOrderApplicationService;
+    @Resource
+    private SystemServiceFeign systemServiceFeign;
+    @Autowired
+    private MaterialBaseInfoMapper materialBaseInfoMapper;
+    @Autowired
+    private StockOutOrderDomainService stockOutOrderDomainService;
+    @Resource
+    private UserServiceFeign userServiceFeign;
     /**
      * 解析出仓委托单Excel
      * @param file 上传的Excel文件
      * @return 解析后的出仓委托单对象
      */
-    public StockOutOrderDO parseOutboundOrderExcel(MultipartFile file, String warehouseName,String warehouseCode,Long warehouseId) throws IOException {
+    public StringBuilder parseOutboundOrderExcel(MultipartFile file, String warehouseName,String warehouseCode,Long warehouseId) throws IOException {
 
         HeaderListener headerListener = new HeaderListener();
 
@@ -61,13 +89,183 @@ public class ExcelParseService {
         itemReader.read(itemSheet);
 
         itemReader.finish();
-
+        List<OutMaterialDetailDO> itemList = itemListener.getItemList();
         StockOutOrderDO stockOutOrder = headerListener.getStockOutOrder();
-        stockOutOrder.setMaterialDetailList(itemListener.getItemList());
+        initList(itemList,warehouseId,warehouseCode,warehouseName);
+        stockOutOrder.setMaterialDetailList(itemList);
         stockOutOrder.setWarehouseName(warehouseName);
         stockOutOrder.setWarehouseCode(warehouseCode);
         stockOutOrder.setWarehouseId(warehouseId);
-        stockOutOrderApplicationService.insert(stockOutOrder);
+        initDict(stockOutOrder);
-        return stockOutOrder;
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            stockOutOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            stockOutOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
+            stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+        }
+        initParam(stockOutOrder);
+        //校验必填字段
+        StringBuilder errorMsg = check(stockOutOrder);
+        if (errorMsg.length() > 0) {
+            return errorMsg;
+        } else {
+            insert(stockOutOrder);
+            return new StringBuilder();
+        }
+    }
+
+    private void initParam(StockOutOrderDO stockOutOrderDO) {
+        //设置货主信息
+        shipperParam(stockOutOrderDO);
+        //设置客户信息
+        customerParam(stockOutOrderDO);
+    }
+
+    /**
+     * 新增出库单
+     */
+    public Boolean insert(StockOutOrderDO stockOutOrderDO) {
+        return stockOutOrderDomainService.insert(stockOutOrderDO);
+    }
+
+    /**
+     * @description 封装货主信息
+     * @author ZhouGY
+     * @date 2024/5/9 20:43
+     * @param stockOutOrderDO
+     */
+    private void shipperParam(StockOutOrderDO stockOutOrderDO){
+        String customerName = stockOutOrderDO.getCustomerName();
+        if (StringUtils.isEmpty(customerName)) return;
+        if (!customerName.matches("\\d+")) {
+            AjaxResult ajaxResult = userServiceFeign.getInfoByName(customerName);
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取客户信息失败");
+            }
+            UserPo userPo = JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setShipperId(userPo.getUserId());
+            stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setShipperName(userPo.getUserName());
+        } else {
+            AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(customerName));
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取货主信息失败");
+            }
+            UserPo userPo = JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setShipperId(userPo.getUserId());
+            stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setShipperName(userPo.getUserName());
+        }
+    }
+
+    /**
+     * @description 封装客户信息
+     * @author ZhouGY
+     * @date 2024/5/9 20:43
+     * @param stockOutOrderDO
+     */
+    private void customerParam(StockOutOrderDO stockOutOrderDO){
+        String customerName = stockOutOrderDO.getCustomerName();
+        if (StringUtils.isEmpty(customerName)) return;
+        if (!customerName.matches("\\d+")) {
+            AjaxResult ajaxResult = userServiceFeign.getInfoByName(customerName);
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取客户信息失败");
+            }
+            UserPo userPo = JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setCustomerId(userPo.getUserId());
+            stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setCustomerName(userPo.getUserName());
+        } else {
+            AjaxResult ajaxResult = userServiceFeign.getInfo(Long.valueOf(customerName));
+            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+                throw new ServiceException("获取客户信息失败");
+            }
+            UserPo userPo = JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+            stockOutOrderDO.setCustomerId(userPo.getUserId());
+            stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
+            stockOutOrderDO.setCustomerName(userPo.getUserName());
+        }
+    }
+
+    private StringBuilder check(StockOutOrderDO stockOutOrder) {
+        StringBuilder errorMsg = new StringBuilder();
+        if (stockOutOrder.getMaterialDetailList() == null || stockOutOrder.getMaterialDetailList().isEmpty()) errorMsg.append("物料明细列表不能为空或匹配不上物料信息; ");
+        if (StringUtils.isEmpty(stockOutOrder.getTo())) errorMsg.append("To不能为空; ");
+        if (StringUtils.isEmpty(stockOutOrder.getEntrustNo())) errorMsg.append("委托单号不能为空; ");
+        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.getDepartureArrivalCountry())) errorMsg.append("出发/到达国家不能为空; ");
+        if (StringUtils.isEmpty(stockOutOrder.getManufacturer())) 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不能为空; ");
+        if (ObjectUtil.isEmpty(stockOutOrder.getShipperId())) errorMsg.append("客户名称不能为空或匹配不上客户信息; ");
+        //if (StringUtils.isEmpty(stockOutOrder.getNeedDeclareFlag())) errorMsg.append("是否需要申报不能为空; ");
+        if (StringUtils.isEmpty(stockOutOrder.getDeclareCustoms())) errorMsg.append("申报地关区不能为空; ");
+        if (StringUtils.isEmpty(stockOutOrder.getEntryExitCustoms())) errorMsg.append("进出境关别不能为空; ");
+        //if (StringUtils.isEmpty(stockOutOrder.getNeedTransportFlag())) errorMsg.append("是否需要运输不能为空; ");
+        return errorMsg;
+    }
+
+    private void initList(List<OutMaterialDetailDO> outMaterialDetailDOList, Long warehouseId, String warehouseCode, String warehouseName) {
+        for (OutMaterialDetailDO outMaterialDetailDO : outMaterialDetailDOList) {
+            outMaterialDetailDO.setWarehouseId(warehouseId);
+            outMaterialDetailDO.setWarehouseCode(warehouseCode);
+            outMaterialDetailDO.setWarehouseName(warehouseName);
+            String materialNo = outMaterialDetailDO.getMaterialNo();
+            List<MaterialBaseInfo> materialBaseInfos = materialBaseInfoMapper.selectList(new LambdaQueryWrapper<MaterialBaseInfo>().eq(MaterialBaseInfo::getMaterialCode, materialNo));
+            if (!materialBaseInfos.isEmpty()) {
+                if (materialBaseInfos.size() > 1) {
+                    return;
+                }
+                MaterialBaseInfo materialBaseInfo = materialBaseInfos.get(0);
+                outMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfo.getMaterialBaseInfoId());
+            }
+        }
+    }
+
+    private void initDict(StockOutOrderDO stockOutOrder) {
+        if (ObjectUtil.isNotNull(stockOutOrder.getContainerNoName())) {
+            AjaxResult transportMode = systemServiceFeign.selectListByDictType("cabinetNo");
+            if (ObjectUtil.isNotNull(transportMode) && "200".equals(String.valueOf(transportMode.get("code")))) {
+                List<SysDictDataVo> transportModeList = JSON.parseArray(JSONObject.toJSONString(transportMode.get("data")), SysDictDataVo.class);
+                for (SysDictDataVo sysDictDataVo : transportModeList) {
+                    if (stockOutOrder.getContainerNoName().equals(sysDictDataVo.getDictLabel())) {
+                        stockOutOrder.setContainerNo(sysDictDataVo.getDictValue());
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (ObjectUtil.isNotNull(stockOutOrder.getTransportModeName())) {
+            AjaxResult transportMode = systemServiceFeign.selectListByDictType("transportMode");
+            if (ObjectUtil.isNotNull(transportMode) && "200".equals(String.valueOf(transportMode.get("code")))) {
+                List<SysDictDataVo> transportModeList = JSON.parseArray(com.alibaba.fastjson2.JSONObject.toJSONString(transportMode.get("data")), SysDictDataVo.class);
+                for (SysDictDataVo sysDictDataVo : transportModeList) {
+                    if (stockOutOrder.getTransportModeName().equals(sysDictDataVo.getDictLabel())) {
+                        stockOutOrder.setTransportModeCode(sysDictDataVo.getDictValue());
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (ObjectUtil.isNotNull(stockOutOrder.getSupervisionModeName())) {
+            AjaxResult transportMode = systemServiceFeign.selectListByDictType("controlType");
+            if (ObjectUtil.isNotNull(transportMode) && "200".equals(String.valueOf(transportMode.get("code")))) {
+                List<SysDictDataVo> transportModeList = JSON.parseArray(com.alibaba.fastjson2.JSONObject.toJSONString(transportMode.get("data")), SysDictDataVo.class);
+                for (SysDictDataVo sysDictDataVo : transportModeList) {
+                    if (stockOutOrder.getSupervisionModeName().equals(sysDictDataVo.getDictLabel())) {
+                        stockOutOrder.setSupervisionModeCode(sysDictDataVo.getDictValue());
+                        break;
+                    }
+                }
+            }
+        }
     }
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/HeaderListener.java

@@ -1,20 +1,14 @@
 package com.mhd.wms.domain.stockOutOrder.repository.listener;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.metadata.data.ReadCellData;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.mhd.common.core.domain.po.SysDictDataVo;
-import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.UserServiceFeign;
-import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
 import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -23,7 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Collections;
 import java.util.ArrayList;
-import java.util.stream.Collectors;
 
 /**
  * 解析表头信息的监听器（处理前11行）
@@ -33,10 +26,6 @@ public class HeaderListener extends AnalysisEventListener<Map<Integer, Object>>
     private final StockOutOrderDO stockOutOrder = new StockOutOrderDO();
     private int rowNum = 0;
     private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-    @Autowired
-    private SystemServiceFeign systemServiceFeign;
-    @Autowired
-    private UserServiceFeign userServiceFeign;
 
     @Override
     public void invoke(Map<Integer, Object> data, AnalysisContext context) {
@@ -57,19 +46,7 @@ public class HeaderListener extends AnalysisEventListener<Map<Integer, Object>>
             case 5: // 第6行：承运方、tel、柜号、司机签名
                 stockOutOrder.setCarrier(getStringValue(rowData[2]));
                 stockOutOrder.setTel(getStringValue(rowData[5]));
-                if (ObjectUtil.isNotNull(getStringValue(rowData[12]))) {
+                stockOutOrder.setContainerNoName(getStringValue(rowData[12]));
-                    stockOutOrder.setContainerNoName(getStringValue(rowData[12]));
-                    AjaxResult transportMode = systemServiceFeign.selectListByDictType("cabinetNo");
-                    if (ObjectUtil.isNotNull(transportMode) && transportMode.get("code").equals("200")) {
-                        List<SysDictDataVo> transportModeList = JSON.parseArray(JSONObject.toJSONString(transportMode.get("data")), SysDictDataVo.class);
-                        for (SysDictDataVo sysDictDataVo : transportModeList) {
-                            if (getStringValue(rowData[12]).equals(sysDictDataVo.getDictLabel())) {
-                                stockOutOrder.setContainerNo(sysDictDataVo.getDictValue());
-                                break;
-                            }
-                        }
-                    }
-                }
                 stockOutOrder.setDriverSign(getStringValue(rowData[16]));
                 break;
             case 6: // 第7行：出仓日期、fax、运输方式、申报地关区
@@ -79,19 +56,7 @@ public class HeaderListener extends AnalysisEventListener<Map<Integer, Object>>
                     stockOutOrder.setOutboundDate(date);
                 }
                 stockOutOrder.setFax(getStringValue(rowData[5]));
-                if (ObjectUtil.isNotNull(getStringValue(rowData[12]))) {
+                stockOutOrder.setTransportModeName(getStringValue(rowData[12]));
-                    stockOutOrder.setTransportModeName(getStringValue(rowData[12]));
-                    AjaxResult transportMode = systemServiceFeign.selectListByDictType("transportMode");
-                    if (ObjectUtil.isNotNull(transportMode) && transportMode.get("code").equals("200")) {
-                        List<SysDictDataVo> transportModeList = JSON.parseArray(JSONObject.toJSONString(transportMode.get("data")), SysDictDataVo.class);
-                        for (SysDictDataVo sysDictDataVo : transportModeList) {
-                            if (getStringValue(rowData[12]).equals(sysDictDataVo.getDictLabel())) {
-                                stockOutOrder.setTransportModeCode(sysDictDataVo.getDictValue());
-                                break;
-                            }
-                        }
-                    }
-                }
                 stockOutOrder.setDeclareCustoms(getStringValue(rowData[16]));
                 break;
             case 7: // 第8行：生产商、客户名称、报关姓名及联系方式、完成时间
@@ -105,21 +70,10 @@ public class HeaderListener extends AnalysisEventListener<Map<Integer, Object>>
                 }
                 break;
             case 8: // 第9行：监管方式、送货地址、海关是否查验货物、进出境关别
-                if (ObjectUtil.isNotNull(getStringValue(rowData[2]))) {
+                stockOutOrder.setSupervisionModeName(getStringValue(rowData[2]));
-                    stockOutOrder.setSupervisionModeName(getStringValue(rowData[2]));
-                    AjaxResult transportMode = systemServiceFeign.selectListByDictType("controlType");
-                    if (ObjectUtil.isNotNull(transportMode) && transportMode.get("code").equals("200")) {
-                        List<SysDictDataVo> transportModeList = JSON.parseArray(JSONObject.toJSONString(transportMode.get("data")), SysDictDataVo.class);
-                        for (SysDictDataVo sysDictDataVo : transportModeList) {
-                            if (getStringValue(rowData[2]).equals(sysDictDataVo.getDictLabel())) {
-                                stockOutOrder.setSupervisionModeCode(sysDictDataVo.getDictValue());
-                                break;
-                            }
-                        }
-                    }
-                }
                 stockOutOrder.setDeliveryAddr(getStringValue(rowData[5]));
-                stockOutOrder.setCustomsInspectionFlag(getStringValue(rowData[12]));
+                String stringValue = getStringValue(rowData[12]);
+                stockOutOrder.setCustomsInspectionFlag(stringValue);
                 stockOutOrder.setEntryExitCustoms(getStringValue(rowData[16]));
                 break;
             case 9: // 第10行：下单日期、起运国

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ItemListener.java

@@ -22,8 +22,6 @@ import java.util.Collections;
 public class ItemListener extends AnalysisEventListener<Map<Integer, Object>> {
     private final List<OutMaterialDetailDO> itemList = new ArrayList<>();
 
-    @Autowired
-    private MaterialBaseInfoMapper materialBaseInfoMapper;
 
     @Override
     public void invoke(Map<Integer, Object> data, AnalysisContext context) {
@@ -37,7 +35,6 @@ public class ItemListener extends AnalysisEventListener<Map<Integer, Object>> {
         String serialNoStr = getStringValue(rowData[0]);
         String commodityName = getStringValue(rowData[1]);
         String specificationModel = getStringValue(rowData[2]);
-        String skuCode = getStringValue(rowData[4]);
 
         if (commodityName.isEmpty() && specificationModel.isEmpty()) {
             return;
@@ -48,15 +45,7 @@ public class ItemListener extends AnalysisEventListener<Map<Integer, Object>> {
 
         OutMaterialDetailDO item = new OutMaterialDetailDO();
 
-        List<MaterialBaseInfo> materialBaseInfos = materialBaseInfoMapper.selectList(new LambdaQueryWrapper<MaterialBaseInfo>().eq(MaterialBaseInfo::getSkuCode, skuCode).eq(MaterialBaseInfo::getMaterialName, commodityName));
 
-        if (!materialBaseInfos.isEmpty()) {
-            if (materialBaseInfos.size() > 1) {
-                //return;
-            }
-            MaterialBaseInfo materialBaseInfo = materialBaseInfos.get(0);
-            item.setMaterialBaseInfoId(materialBaseInfo.getMaterialBaseInfoId());
-        }
         // 填充商品明细数据
         //商品名称 料号	规格型号/ITEM 	商品SKU码	Invoice No.	申报数量	申报单位	升	箱数	件数	尺寸	仓库数量	"总净重
         //(KG)"	总毛重    (KG)	"总体积

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);
+            StringBuilder result = excelParseService.parseOutboundOrderExcel(file, warehouseName, warehouseCode, warehouseId);
-            return AjaxResult.success(result);
+            if (result.length() > 0) {
+                return AjaxResult.error(result.toString());
+            } else {
+                return AjaxResult.success(result);
+            }
         } catch (IOException e) {
             return error("解析失败");
         }