2025-06-30

增加一个Copy_part_no（用于区分这个料号是从哪里Copy过来的）

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;
 }

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());

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())) {

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);