From a336ed167032f2f5c466eaaec944f13eaf4482a9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 30 Jun 2025 17:18:33 +0800
Subject: [PATCH] =?UTF-8?q?2025-06-30=20=E5=A2=9E=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AACopy=5Fpart=5Fno=EF=BC=88=E7=94=A8=E4=BA=8E=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E8=BF=99=E4=B8=AA=E6=96=99=E5=8F=B7=E6=98=AF=E4=BB=8E?=
 =?UTF-8?q?=E5=93=AA=E9=87=8CCopy=E8=BF=87=E6=9D=A5=E7=9A=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/entity/PartInformationEntity.java     |  2 ++
 .../part/service/impl/PartInformationServiceImpl.java  |  3 +++
 .../modules/sys/controller/SysLoginController.java     | 10 +++++-----
 .../spring/modules/sys/utils/CustomerLdapUtils.java    |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
index 5a097ed4..72e2980c 100644
--- a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
+++ b/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 copyPartNo;
 }
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 8f7311e9..b3aade72 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/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.setShowInQueryFlag(fromPart.getShowInQueryFlag());
 
+        // 2025-06-30 新增copy_part_no 用于区分这个料号是从哪里Copy过来的
+        toPart.setCopyPartNo(fromPart.getPartNo());
+
         if ("Y".equals(inData.getCopyFlag())) { // 转正式里的Copy
             toPart.setPlmPartNo(inData.getPreviousVersion().getPartNo());
             toPart.setIfsPartNo(toPart.getPartNo());
diff --git a/src/main/java/com/spring/modules/sys/controller/SysLoginController.java b/src/main/java/com/spring/modules/sys/controller/SysLoginController.java
index 8be86dd9..f8ab767a 100644
--- a/src/main/java/com/spring/modules/sys/controller/SysLoginController.java
+++ b/src/main/java/com/spring/modules/sys/controller/SysLoginController.java
@@ -83,27 +83,27 @@ public class SysLoginController extends AbstractController {
 
 
 		//是否启用域控账号登录
-		if(ldapFlag){
+		if (ldapFlag) {
 			user = sysUserService.queryByDomainControlAccount(form.getUsername());
 			//判断账号是否存在
-			if(null == user){
+			if (null == user) {
 				// return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200207));
 				return R.error("账号不存在");
 			}
 			//启用域控校验账号和密码
 			customerLdapUtils.CheckLdapAccountAndPassword(form.getUsername(), form.getPassword());
 			//账号锁定
-			if(user.getStatus() == 0){
+			if (user.getStatus() == 0) {
 				// return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208));
 				return R.error("账号被锁定不允许登录");
 			}
 			if(StringUtils.isEmpty(form.getType())) {
 				List<AccessSiteData> accessSiteDataList = sysUserService.checkAccessSite(form.getSite(), user.getUsername());
-				if (accessSiteDataList.size() == 0) {
+				if (accessSiteDataList.isEmpty()) {
 					return R.error("账号没有所选工厂的权限，请联系管理员！");
 				}
 			}
-		}else{
+		} else {
 			user = sysUserService.queryByUserName(form.getUsername());
 			//账号不存在、密码错误
 			if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
diff --git a/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java b/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java
index 1831e3ef..ad5ed9c2 100644
--- a/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java
+++ b/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java
@@ -57,7 +57,7 @@ public class CustomerLdapUtils {
 				.and("sAMAccountName").is(username),
 				mapper);
 		//判断用户是否能找到
-		if(resultList.size() > 0) {
+		if(!resultList.isEmpty()) {
 			try {
 				ldapTemplate.authenticate(LdapQueryBuilder.query().where("objectClass").isPresent()
 						.and("sAMAccountName").is(username),  password);