Browse Source

Merge remote-tracking branch 'origin/jnmc-jinco' into jnmc-jinco

zhangxin 1 year ago
parent
commit
f7451b5b8f

BIN
ruoyi-admin/src/main/resources/lib/modbus-spring-boot-starter.jar


BIN
ruoyi-admin/src/main/resources/lib/rfid-zebra-spring-boot-starter.jar


+ 1 - 0
warewms-base/src/main/java/com/ruoyi/base/utils/IdSequenceUtils.java

@@ -50,6 +50,7 @@ public class IdSequenceUtils {
                 resultNo = (index + 1) + "";
                 resultNo = (index + 1) + "";
             }
             }
 
 
+            //TODO 乐观锁的思想,一旦无法修改成功,返回0,但是20次之后就会出现返回''
             int isOk = baseIdsequenceService.updateByVersion(idName, dateStr, sysIdsequence.getIdSequence(), index + 1);
             int isOk = baseIdsequenceService.updateByVersion(idName, dateStr, sysIdsequence.getIdSequence(), index + 1);
             if (isOk > 0) {
             if (isOk > 0) {
                 return resultNo;
                 return resultNo;