diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml index bc025cc0..1231c21b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml @@ -96,7 +96,7 @@ SELECT * FROM ( SELECT * - FROM co_goods + FROM st_goods WHERE goods_code = #{code} AND release_no = #{releaseNo} AND is_deleted = 0 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java index 6983c8f6..ac8113da 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java @@ -14,10 +14,8 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; -import org.springblade.system.cache.SysCache; import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; -import org.springblade.system.pojo.entity.Dept; import org.springblade.system.pojo.entity.User; import org.springblade.wms.excel.StBuyOrderExcel; import org.springblade.wms.mapper.StBuyOrderMapper; @@ -105,16 +103,16 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName()); + R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); String roleId = roleIdResp.getData(); approvalRecord.setNextRoleId(Long.valueOf(roleId)); mesApprovalRecordClient.save(approvalRecord); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java index ba3bebc6..026db628 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java @@ -89,7 +89,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName()); + R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); String roleId = roleIdResp.getData(); approvalRecord.setNextRoleId(Long.valueOf(roleId)); mesApprovalRecordClient.save(approvalRecord); diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java index ec49bd72..12b44525 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java @@ -5,22 +5,18 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; -import org.springblade.common.exception.BusinessException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.User; -import org.springblade.system.feign.IUserClient; import org.springblade.wms.excel.StWmsRequestExcel; import org.springblade.wms.mapper.StWmsRequestMapper; import org.springblade.wms.pojo.entity.StBuyOrder; -import org.springblade.wms.pojo.entity.StClassRequest; import org.springblade.wms.pojo.entity.StWmsRequest; import org.springblade.wms.pojo.vo.StWmsRequestVO; import org.springblade.wms.service.IStBuyOrderService; @@ -28,7 +24,6 @@ import org.springblade.wms.service.IStWmsRequestService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; /** @@ -106,7 +101,7 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName()); + R roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); String roleId = roleIdResp.getData(); approvalRecord.setNextRoleId(Long.valueOf(roleId)); mesApprovalRecordClient.save(approvalRecord);