suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓库管理修改报错

Browse Source
liweidong
wusiyu 14 hours ago
parent 5399b05621
commit 26cdaf8def
5 changed files with 14 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
  2. 22
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
  3. 7
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java
  4. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
  5. 7
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java

2
blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
Unescape View File

@ -96,7 +96,7 @@
SELECT * SELECT *
FROM ( FROM (
SELECT * SELECT *
FROM co_goods FROM st_goods
WHERE goods_code = #{code} WHERE goods_code = #{code}
AND release_no = #{releaseNo} AND release_no = #{releaseNo}
AND is_deleted = 0 AND is_deleted = 0

22
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
Unescape View File

@ -14,10 +14,8 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.feign.IMesApprovalRecordClient;
import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; 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.ISysClient;
import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.entity.User; import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StBuyOrderExcel; import org.springblade.wms.excel.StBuyOrderExcel;
import org.springblade.wms.mapper.StBuyOrderMapper; import org.springblade.wms.mapper.StBuyOrderMapper;
@ -105,16 +103,16 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
newBuyOrder.setCreateUser(user.getUserId()); newBuyOrder.setCreateUser(user.getUserId());
// 采购部门：固定编码0200 // 采购部门：固定编码0200
Dept buyDept = SysCache.getDeptByCode("0200"); // Dept buyDept = SysCache.getDeptByCode("0200");
if(buyDept != null){ // if(buyDept != null){
newBuyOrder.setBuyDept(buyDept.getId()); // newBuyOrder.setBuyDept(buyDept.getId());
} // }
//
// 需求部门：固定编码3400 // // 需求部门：固定编码3400
Dept needDept = SysCache.getDeptByCode("3400"); // Dept needDept = SysCache.getDeptByCode("3400");
if(needDept != null){ // if(needDept != null){
newBuyOrder.setNeedDept(needDept.getId()); // newBuyOrder.setNeedDept(needDept.getId());
} // }
// ===== 3. 日期默认值：当前系统时间 (原逻辑不变) // ===== 3. 日期默认值：当前系统时间 (原逻辑不变)
newBuyOrder.setDeclareDate(currDate); newBuyOrder.setDeclareDate(currDate);

7
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java
Unescape View File

@ -4,17 +4,13 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.Builder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.C;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.feign.IMesApprovalRecordClient;
import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
@ -30,7 +26,6 @@ import org.springblade.wms.service.*;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
/** /**
@ -107,7 +102,7 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
String roleNameData = roleName.getData(); String roleNameData = roleName.getData();
approvalRecord.setCurrentRoleName(roleNameData); approvalRecord.setCurrentRoleName(roleNameData);
approvalRecord.setNextRoleName("热表-工艺员"); approvalRecord.setNextRoleName("热表-工艺员");
R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName()); R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData(); String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId)); approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord); mesApprovalRecordClient.save(approvalRecord);

2
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
Unescape View File

@ -89,7 +89,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
String roleNameData = roleName.getData(); String roleNameData = roleName.getData();
approvalRecord.setCurrentRoleName(roleNameData); approvalRecord.setCurrentRoleName(roleNameData);
approvalRecord.setNextRoleName("热表-工艺员"); approvalRecord.setNextRoleName("热表-工艺员");
R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName()); R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData(); String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId)); approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord); mesApprovalRecordClient.save(approvalRecord);

7
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java
Unescape View File

@ -5,22 +5,18 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.feign.IMesApprovalRecordClient;
import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity; import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User; import org.springblade.system.pojo.entity.User;
import org.springblade.system.feign.IUserClient;
import org.springblade.wms.excel.StWmsRequestExcel; import org.springblade.wms.excel.StWmsRequestExcel;
import org.springblade.wms.mapper.StWmsRequestMapper; import org.springblade.wms.mapper.StWmsRequestMapper;
import org.springblade.wms.pojo.entity.StBuyOrder; 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.entity.StWmsRequest;
import org.springblade.wms.pojo.vo.StWmsRequestVO; import org.springblade.wms.pojo.vo.StWmsRequestVO;
import org.springblade.wms.service.IStBuyOrderService; import org.springblade.wms.service.IStBuyOrderService;
@ -28,7 +24,6 @@ import org.springblade.wms.service.IStWmsRequestService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
/** /**
@ -106,7 +101,7 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
String roleNameData = roleName.getData(); String roleNameData = roleName.getData();
approvalRecord.setCurrentRoleName(roleNameData); approvalRecord.setCurrentRoleName(roleNameData);
approvalRecord.setNextRoleName("保管员"); approvalRecord.setNextRoleName("保管员");
R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName()); R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData(); String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId)); approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord); mesApprovalRecordClient.save(approvalRecord);

Write Preview
Loading…
Cancel
Save