Browse Source

2025-06-30

增加一个Copy_part_no(用于区分这个料号是从哪里Copy过来的)
master
fengyuan_yang 12 months ago
parent
commit
a336ed1670
  1. 2
      src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
  2. 3
      src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
  3. 2
      src/main/java/com/spring/modules/sys/controller/SysLoginController.java
  4. 2
      src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java

2
src/main/java/com/spring/modules/part/entity/PartInformationEntity.java

@ -394,4 +394,6 @@ public class PartInformationEntity extends QueryPage implements Serializable {
* 临时物料标识 * 临时物料标识
*/ */
private String temporaryPartFlag; private String temporaryPartFlag;
private String copyPartNo;
} }

3
src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java

@ -1844,6 +1844,9 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
toPart.setTemporaryPartFlag(fromPart.getTemporaryPartFlag()); toPart.setTemporaryPartFlag(fromPart.getTemporaryPartFlag());
toPart.setShowInQueryFlag(fromPart.getShowInQueryFlag()); toPart.setShowInQueryFlag(fromPart.getShowInQueryFlag());
// 2025-06-30 新增copy_part_no 用于区分这个料号是从哪里Copy过来的
toPart.setCopyPartNo(fromPart.getPartNo());
if ("Y".equals(inData.getCopyFlag())) { // 转正式里的Copy if ("Y".equals(inData.getCopyFlag())) { // 转正式里的Copy
toPart.setPlmPartNo(inData.getPreviousVersion().getPartNo()); toPart.setPlmPartNo(inData.getPreviousVersion().getPartNo());
toPart.setIfsPartNo(toPart.getPartNo()); toPart.setIfsPartNo(toPart.getPartNo());

2
src/main/java/com/spring/modules/sys/controller/SysLoginController.java

@ -99,7 +99,7 @@ public class SysLoginController extends AbstractController {
} }
if(StringUtils.isEmpty(form.getType())) { if(StringUtils.isEmpty(form.getType())) {
List<AccessSiteData> accessSiteDataList = sysUserService.checkAccessSite(form.getSite(), user.getUsername()); List<AccessSiteData> accessSiteDataList = sysUserService.checkAccessSite(form.getSite(), user.getUsername());
if (accessSiteDataList.size() == 0) {
if (accessSiteDataList.isEmpty()) {
return R.error("账号没有所选工厂的权限,请联系管理员!"); return R.error("账号没有所选工厂的权限,请联系管理员!");
} }
} }

2
src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java

@ -57,7 +57,7 @@ public class CustomerLdapUtils {
.and("sAMAccountName").is(username), .and("sAMAccountName").is(username),
mapper); mapper);
//判断用户是否能找到 //判断用户是否能找到
if(resultList.size() > 0) {
if(!resultList.isEmpty()) {
try { try {
ldapTemplate.authenticate(LdapQueryBuilder.query().where("objectClass").isPresent() ldapTemplate.authenticate(LdapQueryBuilder.query().where("objectClass").isPresent()
.and("sAMAccountName").is(username), password); .and("sAMAccountName").is(username), password);

Loading…
Cancel
Save